diff --git a/kamailio/nodes-role.cfg b/kamailio/nodes-role.cfg index 0c79f0e4..fc3de7b7 100644 --- a/kamailio/nodes-role.cfg +++ b/kamailio/nodes-role.cfg @@ -8,8 +8,8 @@ #!define NODES_FUDGE_FACTOR 3 #!endif -modparam("htable", "htable", "nodes=>size=8;initval=0;autoexpire=180"); -modparam("htable", "htable", "media=>size=8;initval=0;autoexpire=180"); +modparam("htable", "htable", "nodes=>size=8;initval=0;autoexpire=180;"); +modparam("htable", "htable", "media=>size=8;initval=0;autoexpire=180;"); ####### RTIMER module ########## #!ifndef RTIMER_LOADED @@ -30,11 +30,11 @@ modparam("mqueue","mqueue", "name=node_heartbeat") route[NODES_ADVERTISE_ROUTE] { -$var(separator) = ""; +route(LISTENER_STATUS); + #!ifdef DISPATCHER_ROLE route(DISPATCHER_STATUS); - $var(Dispatcher) = $_s("Dispatcher" : {"Groups" : { $var(ds_groups_json) }}); - $var(separator) = " , "; + $var(Dispatcher) = $_s(, "Dispatcher" : {"Groups" : { $var(ds_groups_json) }}); #!else $var(Dispatcher) = ""; #!endif @@ -47,20 +47,18 @@ $var(separator) = ""; route(COUNT_ALL_PRESENTITIES); $var(Presentities) = $_s("Presentities" : {"message-summary" : $xavp(watchers=>message-summary), "dialog" : $xavp(watchers=>dialog), "presence" : $xavp(watchers=>presence)}); - $var(Presence) = $_s($var(separator) "Presence" : {$var(Subscribers), $var(Subscriptions), $var(Presentities)}); - $var(separator) = " , "; + $var(Presence) = $_s(, "Presence" : {$var(Subscribers), $var(Subscriptions), $var(Presentities)}); #!else $var(Presence) = ""; #!endif #!ifdef REGISTRAR_ROLE - $var(Registrar) = $_s($var(separator) "Registrar" : {"Registrations" : $(stat(registered_users){s.int})}); - $var(separator) = " , "; + $var(Registrar) = $_s(, "Registrar" : {"Registrations" : $(stat(registered_users){s.int})}); #!else $var(Registrar) = ""; #!endif - $var(Roles) = $_s("Roles" : {$var(Dispatcher) $var(Presence) $var(Registrar)}); + $var(Roles) = $_s("Roles" : {"Proxy" : $var(listeners) $var(Dispatcher) $var(Presence) $var(Registrar)}); $var(Payload) = '{"Event-Category" : "nodes", "Event-Name" : "advertise", "Expires" : 5000, "Used-Memory" : $(stat(real_used_size){s.int}), "Startup" : $Tb, "WhApps" : {"kamailio" : {"Startup" : $Tb }}, $var(Roles)}'; kazoo_publish("nodes", "", $var(Payload)); } @@ -135,21 +133,23 @@ route[CHECK_MEDIA_SERVERS] $var(Count) = $cnt($avp(MediaKeys)); $var(Idx) = 0; while( $var(Idx) < $var(Count) ) { - $var(MediaKey) = $(avp(MediaKeys)[$var(Idx)]{s.replace,$var(Dot),$var(Perc)}); + $var(MediaName) = $(avp(MediaKeys)[$var(Idx)]); + $var(MediaKey) = $(var(MediaName){s.replace,$var(Dot),$var(Perc)}); avp_delete("$avp(ProfileKeys)/g"); if(kazoo_json_keys($var(Payload), "Media-Servers.$var(MediaKey).Interfaces", "$avp(ProfileKeys)") == 1) { $var(ProfileCount) = $cnt($avp(ProfileKeys)); $var(ProfileIdx) = 0; while( $var(ProfileIdx) < $var(ProfileCount) ) { - $var(MediaRawUrl) = $(var(Payload){kz.json,Media-Servers.$var(MediaKey).Interfaces.$(avp(ProfileKeys)[$var(ProfileIdx)]).URL}); + $var(MediaProfile) = $(avp(ProfileKeys)[$var(ProfileIdx)]); + $var(MediaRawUrl) = $(var(Payload){kz.json,Media-Servers.$var(MediaKey).Interfaces.$var(MediaProfile).URL}); $var(MediaUrl) = $(var(MediaRawUrl){re.subst,/^sip:(.*)@(.*)/sip:\2/}); if($shtinc(media=>$var(MediaUrl)::count) == 1) { $sht(media=>$var(MediaUrl)::zone) = $var(Zone); $shtex(media=>$var(MediaUrl)::zone) = 0; route(MEDIA_SERVER_UP); }; - $shtex(media=>$var(MediaUrl)::count) = ($(var(Payload){kz.json,Expires}{s.int}) / 1000) + NODES_FUDGE_FACTOR; - + $var(MediaExpire) = ($(var(Payload){kz.json,Expires}{s.int}) / 1000) + NODES_FUDGE_FACTOR; + $shtex(media=>$var(MediaUrl)::count) = $var(MediaExpire); $var(ProfileIdx) = $var(ProfileIdx) + 1; } } @@ -158,7 +158,6 @@ route[CHECK_MEDIA_SERVERS] }; } - event_route[htable:expired:media] { $var(MediaUrl) = $(shtrecord(key){re.subst,/(.*)::(.*)/\1/}); @@ -198,6 +197,31 @@ route[NODES_BINDINGS] } #!endif +route[LISTENER_STATUS] +{ + jsonrpc_exec('{"jsonrpc": "2.0", "method": "corex.list_sockets", "id": 1}'); + $var(count) = $(jsonrpl(body){kz.json.count,result}); + $var(loop) = 0; + $var(sep) = ""; + $var(listeners) = ""; + while( $var(loop) < $var(count) ) { + $var(listener) = $(jsonrpl(body){kz.json,result[$var(loop)]}); + $var(proto) = $(var(listener){kz.json,PROTO}); + $var(address) = $(var(listener){kz.json,ADDRLIST.ADDR}); + $var(port) = $(var(listener){kz.json,PORT}); + $var(uri) = $_s($var(proto):$var(address):$var(port)); + if($(var(listener){kz.json,ADVERTISE}) != "-") { + $var(advertise) = $_s( , "advertise" : "$(var(listener){kz.json,ADVERTISE})"); + } else { + $var(advertise) = ""; + } + $var(x) = $_s("$var(uri)" : {"proto" : "$var(proto)", "address" : "$var(address)", "port" : $var(port) $var(advertise) }); + $var(listeners) = $_s($var(listeners)$var(sep)$var(x)); + $var(loop) = $var(loop) + 1; + $var(sep) = " , "; + } + $var(listeners) = $_s({"Listeners" : { $var(listeners) }}); +} # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab