Browse Source

use $sel for selectors

update-rsyslog-config
lazedo 7 years ago
parent
commit
79984514e7
7 changed files with 30 additions and 30 deletions
  1. +1
    -1
      kamailio/dispatcher-role.cfg
  2. +2
    -2
      kamailio/fast-pickup-role.cfg
  3. +9
    -9
      kamailio/presence-notify.cfg
  4. +1
    -1
      kamailio/presence-reset.cfg
  5. +4
    -4
      kamailio/presence-role.cfg
  6. +7
    -7
      kamailio/registrar-role.cfg
  7. +6
    -6
      kamailio/sip_trace-role.cfg

+ 1
- 1
kamailio/dispatcher-role.cfg View File

@ -237,7 +237,7 @@ event_route[dispatcher:dst-up]
route[DISPATCHER_CHECK_MEDIA_SERVER] 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; $var(SetId) = 1;
if($var(Zone) != "MY_AMQP_ZONE") { if($var(Zone) != "MY_AMQP_ZONE") {
$var(SetId) = 2; $var(SetId) = 2;


+ 2
- 2
kamailio/fast-pickup-role.cfg View File

@ -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") { if($var(replaced_call_id) != "none") {
xlog("L_INFO", "$ci|log|request has replaces call-id $var(replaced_call_id)\n"); 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 }'; $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 ## 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") { if($var(AppName) == "park") {
$var(Pickup) = 1; #";a-leg=true"; $var(Pickup) = 1; #";a-leg=true";
} else { } else {


+ 9
- 9
kamailio/presence-notify.cfg View File

@ -19,16 +19,16 @@ route[PRESENCE_LOCAL_NOTIFY]
if($rm != "NOTIFY") { if($rm != "NOTIFY") {
return; 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"); 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"); 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})); $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"); 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(); record_route();
} }
@ -52,7 +52,7 @@ modparam("rtimer", "exec", "timer=pres_cleanup;route=PRESENCE_CLEANUP")
event_route[presence:notify-reply] event_route[presence:notify-reply]
{ {
if(@cfg_get.kazoo.presence_notify != 1)
if($sel(cfg_get.kazoo.presence_notify) != 1)
return; return;
$xavp(pres=>delete_subscription) = 0; $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"); 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"); 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); 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") { if($xavp(pres=>delete_subscription) != 1 && $subs(reason) != "timeout") {
$var(Query) = $_s(KZQ_REPLACE_WATCHERS_LOG); $var(Query) = $_s(KZQ_REPLACE_WATCHERS_LOG);
mq_add("presence_last_notity", "$subs(callid)", "$var(Query)"); mq_add("presence_last_notity", "$subs(callid)", "$var(Query)");


+ 1
- 1
kamailio/presence-reset.cfg View File

@ -28,7 +28,7 @@ route[PRESENCE_RESET_BINDINGS]
route[RESET_PUBLISHER] route[RESET_PUBLISHER]
{ {
xlog("L_INFO", "$var(Msg-ID)|reset|received presence reset for publisher $var(MediaUrl))\n"); 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); $var(Query) = $_s(KZQ_RESET_PUBLISHER_UPDATE);
sql_query("exec", "$var(Query)"); sql_query("exec", "$var(Query)");
} }


+ 4
- 4
kamailio/presence-role.cfg View File

@ -199,7 +199,7 @@ route[HANDLE_NEW_SUBSCRIBE]
route[SUBSCRIBE_AMQP] 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(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,$$,})" }); $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)); kazoo_publish("omnipresence", "$var(rk)", $var(amqp_payload_request));
@ -208,8 +208,8 @@ route[SUBSCRIBE_AMQP]
route[REQUEST_PROBE] 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( route(HAS_PRESENTITY) == 0) {
if($hdr(event) == "message-summary") { if($hdr(event) == "message-summary") {
$var(mwi) = $tU; $var(mwi) = $tU;
@ -379,7 +379,7 @@ event_route[kazoo:consumer-event-presence-mwi-update]
event_route[kazoo:consumer-event-presence-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") { 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"); xlog("L_DEBUG", "$(kzE{kz.json,Call-ID})|log|ignoring $(kzE{kz.json,State}) state $(kzE{kz.json,Presence-ID})\n");
return; return;


+ 7
- 7
kamailio/registrar-role.cfg View File

@ -146,7 +146,7 @@ route[ATTEMPT_AUTHORIZATION]
if($sht(auth_cache=>$Au) != $null if($sht(auth_cache=>$Au) != $null
&& registered("location", "$rz:$Au", 2, 1) == 1 && registered("location", "$rz:$Au", 2, 1) == 1
&& $(xavp(ulattrs=>custom_channel_vars){s.len}) > 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); $var(password) = $sht(auth_cache=>$Au);
route(SAVE_LOCATION); route(SAVE_LOCATION);
exit; exit;
@ -168,12 +168,12 @@ route[ATTEMPT_AUTHORIZATION]
t_drop(); 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"); xlog("L_INFO", "$ci|log|register|forcing failover\n");
t_drop(); t_drop();
} }
if(@cfg_get.kazoo.registrar_error_min_expires == 1) {
if($sel(cfg_get.kazoo.registrar_error_min_expires) == 1) {
route(REGISTRAR_BOUNDS); route(REGISTRAR_BOUNDS);
} }
@ -428,25 +428,25 @@ event_route[usrloc:contact-expired]
{ {
case "ws": case "ws":
case "wss": case "wss":
if(@cfg_get.kazoo.registrar_handle_expired_ws == 1) {
if($sel(cfg_get.kazoo.registrar_handle_expired_ws) == 1) {
$var(handle) = 1; $var(handle) = 1;
} }
break; break;
case "tls": case "tls":
if(@cfg_get.kazoo.registrar_handle_expired_tls == 1) {
if($sel(cfg_get.kazoo.registrar_handle_expired_tls) == 1) {
$var(handle) = 1; $var(handle) = 1;
} }
break; break;
case "tcp": case "tcp":
if(@cfg_get.kazoo.registrar_handle_expired_tcp == 1) {
if($sel(cfg_get.kazoo.registrar_handle_expired_tcp) == 1) {
$var(handle) = 1; $var(handle) = 1;
} }
break; break;
case "udp": case "udp":
if(@cfg_get.kazoo.registrar_handle_expired_udp == 1) {
if($sel(cfg_get.kazoo.registrar_handle_expired_udp) == 1) {
$var(handle) = 1; $var(handle) = 1;
} }
break; break;


+ 6
- 6
kamailio/sip_trace-role.cfg View File

@ -26,26 +26,26 @@ modparam("siptrace", "trace_on", KZ_TRACE)
route[SIP_TRACE_INTERNAL] route[SIP_TRACE_INTERNAL]
{ {
if(@cfg_get.kazoo.trace_internal == 0) {
if($sel(cfg_get.kazoo.trace_internal) == 0) {
return; return;
} }
if(@cfg_get.kazoo.trace_internal_incoming == 1) {
if($sel(cfg_get.kazoo.trace_internal_incoming) == 1) {
sip_trace(); sip_trace();
} }
if(@cfg_get.kazoo.trace_internal_outgoing == 1) {
if($sel(cfg_get.kazoo.trace_internal_outgoing) == 1) {
setflag(FLAG_SIP_TRACE); setflag(FLAG_SIP_TRACE);
} }
} }
route[SIP_TRACE_EXTERNAL] route[SIP_TRACE_EXTERNAL]
{ {
if(@cfg_get.kazoo.trace_external == 0) {
if($sel(cfg_get.kazoo.trace_external) == 0) {
return; return;
} }
if(@cfg_get.kazoo.trace_external_incoming == 1) {
if($sel(cfg_get.kazoo.trace_external_incoming) == 1) {
sip_trace(); sip_trace();
} }
if(@cfg_get.kazoo.trace_external_outgoing == 1) {
if($sel(cfg_get.kazoo.trace_external_outgoing) == 1) {
setflag(FLAG_SIP_TRACE); setflag(FLAG_SIP_TRACE);
} }
} }


Loading…
Cancel
Save