From 7d1af72c0781ab47e204754fb2141a12bb7cc8a6 Mon Sep 17 00:00:00 2001 From: lazedo Date: Sat, 17 Nov 2018 13:49:23 +0000 Subject: [PATCH] use $sel for selectors --- kamailio/dispatcher-role.cfg | 2 +- kamailio/fast-pickup-role.cfg | 4 ++-- kamailio/presence-notify.cfg | 18 +++++++++--------- kamailio/presence-reset.cfg | 2 +- kamailio/presence-role.cfg | 8 ++++---- kamailio/registrar-role.cfg | 14 +++++++------- kamailio/sip_trace-role.cfg | 12 ++++++------ 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/kamailio/dispatcher-role.cfg b/kamailio/dispatcher-role.cfg index 432bcbe..eeb4cdb 100644 --- a/kamailio/dispatcher-role.cfg +++ b/kamailio/dispatcher-role.cfg @@ -237,7 +237,7 @@ event_route[dispatcher:dst-up] route[DISPATCHER_CHECK_MEDIA_SERVER] { - if(@cfg_get.kazoo.dispatcher_auto_add == 1) { + if($sel(cfg_get.kazoo.dispatcher_auto_add) == 1) { $var(SetId) = 1; if($var(Zone) != "MY_AMQP_ZONE") { $var(SetId) = 2; diff --git a/kamailio/fast-pickup-role.cfg b/kamailio/fast-pickup-role.cfg index ca5398c..22904a4 100644 --- a/kamailio/fast-pickup-role.cfg +++ b/kamailio/fast-pickup-role.cfg @@ -65,7 +65,7 @@ route[FAST_PICKUP_ATTEMPT] } } - if(@cfg_get.kazoo.fast_pickup_realtime == 1) { + if($sel(cfg_get.kazoo.fast_pickup_realtime) == 1) { if($var(replaced_call_id) != "none") { xlog("L_INFO", "$ci|log|request has replaces call-id $var(replaced_call_id)\n"); $var(amqp_payload_request) = '{"Event-Category" : "call_event" , "Event-Name" : "channel_status_req", "Call-ID" : "' + $var(replaced_call_id) + '", "Active-Only" : true }'; @@ -159,7 +159,7 @@ route[FAST_PICKUP_INIT] } ## fast pickup with cookies - if(@cfg_get.kazoo.fast_pickup_cookies == 1) { + if($sel(cfg_get.kazoo.fast_pickup_cookies) == 1) { if($var(AppName) == "park") { $var(Pickup) = 1; #";a-leg=true"; } else { diff --git a/kamailio/presence-notify.cfg b/kamailio/presence-notify.cfg index 107f740..59d66bc 100644 --- a/kamailio/presence-notify.cfg +++ b/kamailio/presence-notify.cfg @@ -19,16 +19,16 @@ route[PRESENCE_LOCAL_NOTIFY] if($rm != "NOTIFY") { return; } - t_set_fr(@cfg_get.kazoo.presence_notify_timeout, @cfg_get.kazoo.presence_notify_timeout); + t_set_fr($sel(cfg_get.kazoo.presence_notify_timeout), $sel(cfg_get.kazoo.presence_notify_timeout)); xlog("L_DEBUG", "$ci|log|init preparing $subs(event) notify to $subs(watcher_username)@$subs(watcher_domain) on behalf of $subs(pres_uri) : $du\n"); - if(@cfg_get.kazoo.presence_notify_log_init_body == 1) { + if($sel(cfg_get.kazoo.presence_notify_log_init_body) == 1) { xlog("L_INFO", "$ci|log|init|body $(mb{s.escape.common}{s.replace,\','}{s.replace,$$,})\n"); } - if(@cfg_get.kazoo.presence_notify_force_send_socket == 1) { + if($sel(cfg_get.kazoo.presence_notify_force_send_socket) == 1) { $fs = $_s($(pr{s.tolower}):$(hdr(Contact){nameaddr.uri}{uri.host}):$(hdr(Contact){nameaddr.uri}{uri.port})); xlog("L_DEBUG", "$ci|log|init|forcing socket to $fs, $(pr{s.tolower}):$(hdr(Contact){nameaddr.uri}{uri.host}):$(hdr(Contact){nameaddr.uri}{uri.port}) , $ct\n"); } - if(@cfg_get.kazoo.presence_notify_record_route == 1) { + if($sel(cfg_get.kazoo.presence_notify_record_route) == 1) { record_route(); } @@ -52,7 +52,7 @@ modparam("rtimer", "exec", "timer=pres_cleanup;route=PRESENCE_CLEANUP") event_route[presence:notify-reply] { - if(@cfg_get.kazoo.presence_notify != 1) + if($sel(cfg_get.kazoo.presence_notify) != 1) return; $xavp(pres=>delete_subscription) = 0; @@ -84,16 +84,16 @@ event_route[presence:notify-reply] } } } - if(@cfg_get.kazoo.presence_notify_log_body == 1) + if($sel(cfg_get.kazoo.presence_notify_log_body) == 1) xlog("L_INFO", "$ci|log|sent|body $(mb{s.escape.common}{s.replace,\','}{s.replace,$$,})\n"); - if(@cfg_get.kazoo.presence_notify_log_resp_body == 1) + if($sel(cfg_get.kazoo.presence_notify_log_resp_body) == 1) xlog("L_INFO", "$ci|log|resp|body $(notify_reply($mb){s.escape.common}{s.replace,\','}{s.replace,$$,})\n"); - if(@cfg_get.kazoo.presence_notify_log_to_amqp == 1) { + if($sel(cfg_get.kazoo.presence_notify_log_to_amqp) == 1) { route(PRESENCE_NOTIFY_AMQP); } - if(@cfg_get.kazoo.presence_notify_log_to_table == 1) { + if($sel(cfg_get.kazoo.presence_notify_log_to_table) == 1) { if($xavp(pres=>delete_subscription) != 1 && $subs(reason) != "timeout") { $var(Query) = $_s(KZQ_REPLACE_WATCHERS_LOG); mq_add("presence_last_notity", "$subs(callid)", "$var(Query)"); diff --git a/kamailio/presence-reset.cfg b/kamailio/presence-reset.cfg index b450ad7..5d6ec15 100644 --- a/kamailio/presence-reset.cfg +++ b/kamailio/presence-reset.cfg @@ -28,7 +28,7 @@ route[PRESENCE_RESET_BINDINGS] route[RESET_PUBLISHER] { xlog("L_INFO", "$var(Msg-ID)|reset|received presence reset for publisher $var(MediaUrl))\n"); - if(@cfg_get.kazoo.presence_reset_blf_defer_update == 0) { + if($sel(cfg_get.kazoo.presence_reset_blf_defer_update) == 0) { $var(Query) = $_s(KZQ_RESET_PUBLISHER_UPDATE); sql_query("exec", "$var(Query)"); } diff --git a/kamailio/presence-role.cfg b/kamailio/presence-role.cfg index ab3540e..95a0865 100644 --- a/kamailio/presence-role.cfg +++ b/kamailio/presence-role.cfg @@ -199,7 +199,7 @@ route[HANDLE_NEW_SUBSCRIBE] route[SUBSCRIBE_AMQP] { - if(@cfg_get.kazoo.presence_sync_amqp == 1) { + if($sel(cfg_get.kazoo.presence_sync_amqp) == 1) { $var(rk) = "subscribe." + $(subs(to_domain){kz.encode}) + "." + $(subs(to_user){kz.encode}); $var(amqp_payload_request) = $_s({"Event-Category" : "presence", "Event-Name" : "subscription", "Event-Package" : "$hdr(event)", "Expires" : $subs(expires), "Queue" : "BLF-MY_HOSTNAME", "Server-ID" : "BLF-MY_HOSTNAME" , "Contact" : "$(ct{s.escape.common}{s.replace,\','}{s.replace,$$,})", "Call-ID" : "$ci", "From" : "$fu", "User" : "$subs(uri)", "User-Agent" : "$(ua{s.escape.common}{s.replace,\','}{s.replace,$$,})" }); kazoo_publish("omnipresence", "$var(rk)", $var(amqp_payload_request)); @@ -208,8 +208,8 @@ route[SUBSCRIBE_AMQP] route[REQUEST_PROBE] { - if( (@cfg_get.kazoo.presence_request_probe == 1 && (!has_totag())) - || (@cfg_get.kazoo.presence_request_resubscribe_probe == 1 && has_totag()) ) { + if( ($sel(cfg_get.kazoo.presence_request_probe) == 1 && (!has_totag())) + || ($sel(cfg_get.kazoo.presence_request_resubscribe_probe) == 1 && has_totag()) ) { if( route(HAS_PRESENTITY) == 0) { if($hdr(event) == "message-summary") { $var(mwi) = $tU; @@ -379,7 +379,7 @@ event_route[kazoo:consumer-event-presence-mwi-update] event_route[kazoo:consumer-event-presence-update] { - if(@cfg_get.kazoo.presence_ignore_status_probe_resp == 1) { + if($sel(cfg_get.kazoo.presence_ignore_status_probe_resp) == 1) { if($(kzE{kz.json,State}) == "offline" || $(kzE{kz.json,State}) == "online") { xlog("L_DEBUG", "$(kzE{kz.json,Call-ID})|log|ignoring $(kzE{kz.json,State}) state $(kzE{kz.json,Presence-ID})\n"); return; diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg index e5aa6fc..e0a2d06 100644 --- a/kamailio/registrar-role.cfg +++ b/kamailio/registrar-role.cfg @@ -146,7 +146,7 @@ route[ATTEMPT_AUTHORIZATION] if($sht(auth_cache=>$Au) != $null && registered("location", "$rz:$Au", 2, 1) == 1 && $(xavp(ulattrs=>custom_channel_vars){s.len}) > 1) - && @cfg_get.kazoo.registrar_failover == 0 { + && $sel(cfg_get.kazoo.registrar_failover) == 0 { $var(password) = $sht(auth_cache=>$Au); route(SAVE_LOCATION); exit; @@ -168,12 +168,12 @@ route[ATTEMPT_AUTHORIZATION] t_drop(); } - if(@cfg_get.kazoo.registrar_failover == 1) { + if($sel(cfg_get.kazoo.registrar_failover) == 1) { xlog("L_INFO", "$ci|log|register|forcing failover\n"); t_drop(); } - if(@cfg_get.kazoo.registrar_error_min_expires == 1) { + if($sel(cfg_get.kazoo.registrar_error_min_expires) == 1) { route(REGISTRAR_BOUNDS); } @@ -428,25 +428,25 @@ event_route[usrloc:contact-expired] { case "ws": case "wss": - if(@cfg_get.kazoo.registrar_handle_expired_ws == 1) { + if($sel(cfg_get.kazoo.registrar_handle_expired_ws) == 1) { $var(handle) = 1; } break; case "tls": - if(@cfg_get.kazoo.registrar_handle_expired_tls == 1) { + if($sel(cfg_get.kazoo.registrar_handle_expired_tls) == 1) { $var(handle) = 1; } break; case "tcp": - if(@cfg_get.kazoo.registrar_handle_expired_tcp == 1) { + if($sel(cfg_get.kazoo.registrar_handle_expired_tcp) == 1) { $var(handle) = 1; } break; case "udp": - if(@cfg_get.kazoo.registrar_handle_expired_udp == 1) { + if($sel(cfg_get.kazoo.registrar_handle_expired_udp) == 1) { $var(handle) = 1; } break; diff --git a/kamailio/sip_trace-role.cfg b/kamailio/sip_trace-role.cfg index 6fb847b..7508567 100644 --- a/kamailio/sip_trace-role.cfg +++ b/kamailio/sip_trace-role.cfg @@ -26,26 +26,26 @@ modparam("siptrace", "trace_on", KZ_TRACE) route[SIP_TRACE_INTERNAL] { - if(@cfg_get.kazoo.trace_internal == 0) { + if($sel(cfg_get.kazoo.trace_internal) == 0) { return; } - if(@cfg_get.kazoo.trace_internal_incoming == 1) { + if($sel(cfg_get.kazoo.trace_internal_incoming) == 1) { sip_trace(); } - if(@cfg_get.kazoo.trace_internal_outgoing == 1) { + if($sel(cfg_get.kazoo.trace_internal_outgoing) == 1) { setflag(FLAG_SIP_TRACE); } } route[SIP_TRACE_EXTERNAL] { - if(@cfg_get.kazoo.trace_external == 0) { + if($sel(cfg_get.kazoo.trace_external) == 0) { return; } - if(@cfg_get.kazoo.trace_external_incoming == 1) { + if($sel(cfg_get.kazoo.trace_external_incoming) == 1) { sip_trace(); } - if(@cfg_get.kazoo.trace_external_outgoing == 1) { + if($sel(cfg_get.kazoo.trace_external_outgoing) == 1) { setflag(FLAG_SIP_TRACE); } }