From a69c3fdf68826a4200d2a2c6b2d5ec8c63893b96 Mon Sep 17 00:00:00 2001 From: Edwin Fine Date: Fri, 15 Jun 2018 16:09:46 +0000 Subject: [PATCH] Add (int) cast to remove log warning --- kamailio/registrar-role.cfg | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg index 0da7f73..353220e 100644 --- a/kamailio/registrar-role.cfg +++ b/kamailio/registrar-role.cfg @@ -71,8 +71,8 @@ route[HANDLE_REGISTER] ## KAZOO-1846: Cisco SPA8000 freaks out on options pings if (!($ua =~ "Linksys/SPA8000" - || $ua =~ "OpenBTS" - || $ua =~ "SIPp" + || $ua =~ "OpenBTS" + || $ua =~ "SIPp" || (af==INET6) )) { setbflag(FLB_NATB); @@ -256,7 +256,7 @@ route[SAVE_LOCATION] } } - if(@contact.expires) { + if((int)@contact.expires) { $var(expires) = @contact.expires; } else { if(is_present_hf("Expires")) { @@ -300,19 +300,19 @@ route[SAVE_LOCATION] $var(port) = KZ_WEBSOCKETS_REGISTRAR_PORT; break; #!endif - + #!ifdef KZ_TLS_REGISTRAR_PORT case "tls": $var(port) = KZ_TLS_REGISTRAR_PORT; break; #!endif - + #!ifdef KZ_UDP_REGISTRAR_PORT case "udp": $var(port) = KZ_UDP_REGISTRAR_PORT; break; #!endif - + #!ifdef KZ_TCP_REGISTRAR_PORT case "tcp": $var(port) = KZ_UDP_REGISTRAR_PORT; @@ -327,7 +327,7 @@ route[SAVE_LOCATION] if(af==INET6) { $var(AdvIP) = "[" + $RAi + "]"; } - + $var(amqp_payload_request) = $_s({"Event-Category" : "directory", "Event-Name" : "reg_success", "Status" : "$var(Status)", "Event-Timestamp" : $TS, "Expires" : $(var(expires){s.int}), "First-Registration" : $var(new_reg), "Contact" : "$(ct{s.escape.common}{s.replace,\','}{s.replace,$$,})", "Call-ID" : "$ci", "Realm" : "$fd", "Username" : "$fU", "From-User" : "$fU", "From-Host" : "$fd", "To-User" : "$tU", "To-Host" : "$td", "User-Agent" : "$(ua{s.escape.common}{s.replace,\','}{s.replace,$$,})" , "Custom-Channel-Vars" : $xavp(ulattrs=>custom_channel_vars), "Proxy-Path" : "sip:$var(ip):$var(port)", "Proxy-Protocol" : "$proto", "Proxy-IP" : "$var(AdvIP)", "Proxy-Port" : "$RAp", "Source-IP": "$si", "Source-Port": "$sp" }); $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $(fU{kz.encode}); @@ -360,7 +360,7 @@ event_route[kazoo:consumer-event-directory-reg-flush] } reg_free_contacts("caller"); } - + #!ifdef ANTIFLOOD_ROLE route(ANTIFLOOD_RESET_AUTH); @@ -370,12 +370,12 @@ event_route[kazoo:consumer-event-directory-reg-flush] route[REGISTRAR_BINDINGS] { #!import_file "registrar-custom-bindings.cfg" - - #!ifndef REGISTRAR_CUSTOM_BINDINGS + + #!ifndef REGISTRAR_CUSTOM_BINDINGS $var(payload) = "{ 'exchange' : 'registrar' , 'type' : 'topic', 'queue' : 'registrar-flush-MY_HOSTNAME', 'routing' : 'registration.flush.*', 'federate' : 1 }"; kazoo_subscribe("$var(payload)"); - + #!endif #!ifdef REGISTRAR_SYNC_ROLE