Browse Source

remove trailing white spaces

update-rsyslog-config
lazedo 7 years ago
parent
commit
5a4e384296
15 changed files with 70 additions and 68 deletions
  1. +2
    -2
      kamailio/antiflood-role.cfg
  2. +16
    -16
      kamailio/default.cfg
  3. +1
    -1
      kamailio/defs.cfg
  4. +5
    -3
      kamailio/dispatcher-role.cfg
  5. +2
    -2
      kamailio/fast-pickup-role.cfg
  6. +1
    -1
      kamailio/kazoo-bindings.cfg
  7. +1
    -1
      kamailio/local.cfg
  8. +1
    -1
      kamailio/message-role.cfg
  9. +3
    -3
      kamailio/nat-traversal-role.cfg
  10. +9
    -9
      kamailio/nodes-role.cfg
  11. +2
    -2
      kamailio/presence-query.cfg
  12. +12
    -12
      kamailio/presence-role.cfg
  13. +5
    -5
      kamailio/pusher-role.cfg
  14. +9
    -9
      kamailio/registrar-role.cfg
  15. +1
    -1
      kamailio/websockets-role.cfg

+ 2
- 2
kamailio/antiflood-role.cfg View File

@ -73,7 +73,7 @@ route[ANITFLOOD_FAILED_AUTH]
xlog("L_INFO", "$ci|log|$var(count) errounous authorization response for $Au $si:$sp\n");
if ($var(count) >= ANTIFLOOD_FAILED_AUTH_DENSITY) {
if ($var(count) >= ANTIFLOOD_FAILED_AUTH_DENSITY) {
$var(exp) = $Ts - ANTIFLOOD_FAILED_AUTH_WINDOW;
if($sht(antiflood=>$Au::$si::last) > $var(exp)){
xlog("L_NOTICE", "$ci|end|request at authorization failure limit for $Au $si:$sp\n");
@ -84,7 +84,7 @@ route[ANITFLOOD_FAILED_AUTH]
}
}
event_route[htable:expired:antiflood]
event_route[htable:expired:antiflood]
{
xlog("L_NOTICE", "antiflood expired record $shtrecord(key) => $shtrecord(value)\n");
}

+ 16
- 16
kamailio/default.cfg View File

@ -311,7 +311,7 @@ modparam("debugger", "mod_level", "core=1")
route
{
route(SANITY_CHECK);
route(CHECK_RETRANS);
# log the basic info regarding this call
@ -544,7 +544,7 @@ route[HANDLE_MESSAGE]
route[HANDLE_IN_DIALOG_REQUESTS]
{
if (!has_totag()) return;
if (is_method("INVITE")) {
setflag(FLAG_SESSION_PROGRESS);
}
@ -560,7 +560,7 @@ route[HANDLE_IN_DIALOG_REQUESTS]
route(NAT_MANAGE);
}
#!endif
#!ifdef ACCOUNTING_ROLE
if (is_method("BYE")) {
setflag(FLAG_ACC);
@ -572,7 +572,7 @@ route[HANDLE_IN_DIALOG_REQUESTS]
# Called on in-dialog requests
# If the request in an Invite for on hold from external to internal,
# associate the contact with the media server
# if Invite for on hold, we need to associate the contact URI with the next hop
# if Invite for on hold, we need to associate the contact URI with the next hop
if (is_method("INVITE") && !isflagset(FLAG_INTERNALLY_SOURCED) && is_audio_on_hold()) {
setflag(FLAG_ASSOCIATE_USER);
}
@ -661,11 +661,11 @@ route[RELAY]
#!ifdef SIP_TRACE_ROLE
route(SEND_SIP_TRACE);
#!endif
if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) {
if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH");
}
if (isflagset(FLAG_INTERNALLY_SOURCED)) {
route(INTERNAL_TO_EXTERNAL_RELAY);
#!ifdef MESSAGE_ROLE
@ -746,7 +746,7 @@ onreply_route[EXTERNAL_REPLY]
setflag(FLAG_IS_REPLY);
route(DOS_PREVENTION);
#!endif
#!ifdef MESSAGE_ROLE
if (is_method("MESSAGE")) {
route(MESSAGE_REPLY);
@ -924,28 +924,28 @@ route[ADD_AUTHORIZATION_HEADERS]
if (registered("location","$fu", 2, 1) == 1) {
if($(xavp(ulattrs=>custom_channel_vars){kz.json,Account-ID}{s.len}) > 0)
append_hf("X-ecallmgr_Account-ID: $(xavp(ulattrs=>custom_channel_vars){kz.json,Account-ID})\r\n");
if($(xavp(ulattrs=>custom_channel_vars){kz.json,Authorizing-Type}{s.len}) > 0)
append_hf("X-ecallmgr_Authorizing-Type: $(xavp(ulattrs=>custom_channel_vars){kz.json,Authorizing-Type})\r\n");
if($(xavp(ulattrs=>custom_channel_vars){kz.json,Authorizing-ID}{s.len}) > 0)
append_hf("X-ecallmgr_Authorizing-ID: $(xavp(ulattrs=>custom_channel_vars){kz.json,Authorizing-ID})\r\n");
if($(xavp(ulattrs=>custom_channel_vars){kz.json,Username}{s.len}) > 0)
append_hf("X-ecallmgr_Username: $(xavp(ulattrs=>custom_channel_vars){kz.json,Username})\r\n");
if($(xavp(ulattrs=>custom_channel_vars){kz.json,Realm}{s.len}) > 0)
append_hf("X-ecallmgr_Realm: $(xavp(ulattrs=>custom_channel_vars){kz.json,Realm})\r\n");
if($(xavp(ulattrs=>custom_channel_vars){kz.json,Account-Realm}{s.len}) > 0)
append_hf("X-ecallmgr_Account-Realm: $(xavp(ulattrs=>custom_channel_vars){kz.json,Account-Realm})\r\n");
if($(xavp(ulattrs=>custom_channel_vars){kz.json,Account-Name}{s.len}) > 0)
append_hf("X-ecallmgr_Account-Name: $(xavp(ulattrs=>custom_channel_vars){kz.json,Account-Name})\r\n");
if($(xavp(ulattrs=>custom_channel_vars){kz.json,Presence-ID}{s.len}) > 0)
append_hf("X-ecallmgr_Presence-ID: $(xavp(ulattrs=>custom_channel_vars){kz.json,Presence-ID})\r\n");
if($(xavp(ulattrs=>custom_channel_vars){kz.json,Owner-ID}{s.len}) > 0)
append_hf("X-ecallmgr_Owner-ID: $(xavp(ulattrs=>custom_channel_vars){kz.json,Owner-ID})\r\n");
}
@ -960,7 +960,7 @@ event_route[tm:local-request]
xlog("L_DEBUG", "$ci|local|source $si:$sp -> $dd:$dp\n");
xlog("L_DEBUG", "$ci|local|from $fu\n");
xlog("L_DEBUG", "$ci|local|to $tu\n");
#!ifdef PRESENCE_ROLE
route(PRESENCE_LOCAL_NOTIFY);
#!endif


+ 1
- 1
kamailio/defs.cfg View File

@ -57,7 +57,7 @@
#!trydef RR_FULL_LR 1
#!trydef RR_DOUBLE_RR 1
#!trydef RR_FORCE_SOCKET 1
#################################
## Defs related to SIP_TRACE_ROLE
##


+ 5
- 3
kamailio/dispatcher-role.cfg View File

@ -58,7 +58,7 @@ modparam("rtimer", "exec", "timer=dispatcher_reload;route=DISPATCHER_RELOAD")
route[DISPATCHER_CLASSIFY_SOURCE]
{
#!import_file "dispatcher-network-classify.cfg"
if (is_myself("$ou")) {
xlog("L_INFO", "$ci|log|original R-URI ($ou) is this proxy, treating as external sources\n");
} else if (
@ -92,11 +92,12 @@ route[DISPATCHER_FIND_ROUTES]
$var(ds_primary_group) = $sel(cfg_get.kazoo.dispatcher_primary_group);
$var(ds_backup_group) = $sel(cfg_get.kazoo.dispatcher_secondary_group);
#!ifndef PRESENCE_ROLE
if (is_method("SUBSCRIBE")) {
$var(ds_primary_group) = KZ_DISPATCHER_PRESENCE_PRIMARY_GROUP;
$var(ds_backup_group) = KZ_DISPATCHER_PRESENCE_SECONDARY_GROUP;
add_path();
}
#!endif
@ -104,6 +105,7 @@ route[DISPATCHER_FIND_ROUTES]
if (is_method("REGISTER")) {
$var(ds_primary_group) = KZ_DISPATCHER_REGISTRAR_PRIMARY_GROUP;
$var(ds_backup_group) = KZ_DISPATCHER_REGISTRAR_SECONDARY_GROUP;
add_path();
}
#!endif
@ -273,7 +275,7 @@ route[DISPATCHER_RELOAD]
xlog("L_WARNING", "reloading dispatcher table\n");
ds_reload();
};
$shv(dispatcher_reload) = 0;
$shv(dispatcher_reload) = 0;
}
route[DISPATCHER_STATUS]


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

@ -101,7 +101,7 @@ route[FAST_PICKUP_ATTEMPT]
}
##### CALL-PARK ####
##### STAR 5 CHECK ####
if($sel(cfg_get.kazoo.fast_pickup_star_5) == 1) {
if($(ru{uri.user}) =~ "\*5") {
@ -139,7 +139,7 @@ route[FAST_PICKUP_ATTEMPT]
exit();
}
}
}
}
}
route[FAST_PICKUP_OPTION]


+ 1
- 1
kamailio/kazoo-bindings.cfg View File

@ -100,7 +100,7 @@ event_route[kazoo:consumer-event-connection-zone-listener-unavailable]
event_route[kazoo:consumer-event-connection-listener-zone-available]
{
xlog("L_NOTICE","amqp|connection|$(kzE{kz.json,zone})|$(kzE{kz.json,name})|listener available\n");
xlog("L_NOTICE","amqp|connection|$(kzE{kz.json,zone})|$(kzE{kz.json,name})|listener available\n");
}
event_route[kazoo:consumer-event-connection-listener-zone-unavailable]


+ 1
- 1
kamailio/local.cfg View File

@ -75,7 +75,7 @@
## BINDINGS
################################################################################
## This parameter is OPTIONAL.
## when set to 1,
## when set to 1,
## It will try to locate outbound interface
## on multihomed host. By default forward
## requests use the incoming socket disregarding


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

@ -40,7 +40,7 @@ route[MESSAGE_REPLY]
}
$var(Payload) = '{ "Event-Category" : "message", "Event-Name" : "delivery", "Call-ID" : "$(sht(msg=>$ci){kz.json,Call-ID})", "Message-ID" : "$(sht(msg=>$ci){kz.json,Message-ID})" , "Delivery-Result-Code" : "sip:$T_reply_code", "Msg-ID" : "$(sht(msg=>$ci){kz.json,Msg-ID})" , "Status" : "$var(Result)"}';
$var(RoutingKey) = $(sht(msg=>$ci){kz.json,Server-ID});
$var(exchange) = "targeted";
if($var(RoutingKey) == "") {


+ 3
- 3
kamailio/nat-traversal-role.cfg View File

@ -60,16 +60,16 @@ route[NAT_DETECT]
if(is_first_hop()) set_contact_alias();
}
}
if($sel(cfg_get.kazoo.nat_fix_sdp_request) == 1) {
if (has_body("application/sdp") && nat_uac_test(KZ_NAT_SDP_TEST)) {
fix_nated_sdp(KZ_NAT_SDP_FIX);
}
}
}
route[NAT_MANAGE]
route[NAT_MANAGE]
{
if ( is_request() && isflagset(FLAG_INTERNALLY_SOURCED)) {
setbflag(FLB_NATB);


+ 9
- 9
kamailio/nodes-role.cfg View File

@ -58,7 +58,7 @@ route(LISTENER_STATUS);
event_route[kazoo:consumer-event-nodes-advertise]
{
$var(count) = $shtinc(nodes=>$(kzE{kz.json,Node})::count);
$var(count) = $shtinc(nodes=>$(kzE{kz.json,Node})::count);
if($var(count) == 0) {
xlog("L_WARNING", "$(kzE{kz.json,Msg-ID})|nodes|heartbeat for reconnected node $(kzE{kz.json,Node})\n");
$var(count) = $shtinc(nodes=>$(kzE{kz.json,Node})::count);
@ -68,7 +68,7 @@ event_route[kazoo:consumer-event-nodes-advertise]
} else {
xlog("L_DEBUG", "$(kzE{kz.json,Msg-ID})|nodes|heartbeat from existing node $(kzE{kz.json,Node})\n");
}
}
}
mq_add("node_heartbeat", "$(kzE{kz.json,Node})", "$kzE");
}
@ -105,11 +105,11 @@ route[NODE_HEARTBEAT_ROUTE]
xlog("L_DEBUG", "$(var(Payload){kz.json,Msg-ID})|nodes|processing heartbeat for node $var(Node)\n");
route(CHECK_MEDIA_SERVERS);
$sht(nodes=>$var(Node)) = $var(Payload);
$shtex(nodes=>$var(Node)) = ($(var(Payload){kz.json,Expires}{s.int}) / 1000) + NODES_FUDGE_EXPIRE;
$shtex(nodes=>$var(Node)) = ($(var(Payload){kz.json,Expires}{s.int}) / 1000) + NODES_FUDGE_EXPIRE;
$var(runloop) = $var(runloop) + 1;
}
}
}
route[CHECK_MEDIA_SERVERS]
@ -152,7 +152,7 @@ route[CHECK_MEDIA_SERVERS]
route(MEDIA_SERVER_RESTART);
};
$var(MediaExpire) = ($(var(Payload){kz.json,Expires}{s.int}) / 1000) + NODES_FUDGE_EXPIRE;
xlog("L_DEBUG", "nodes|media|$var(Node) media expiration $var(MediaExpire) for $var(MediaUrl)\n");
xlog("L_DEBUG", "nodes|media|$var(Node) media expiration $var(MediaExpire) for $var(MediaUrl)\n");
$shtex(media=>$var(MediaUrl)::count) = $var(MediaExpire);
$var(ProfileIdx) = $var(ProfileIdx) + 1;
}
@ -186,7 +186,7 @@ route[MEDIA_SERVER_UP]
route[MEDIA_SERVER_DOWN]
{
xlog("L_WARNING", "htable|media|heartbeat expired for media server $var(MediaUrl) in zone $var(Zone)\n");
#!ifdef PRESENCE_ROLE
route(RESET_PUBLISHER);
#!endif
@ -196,7 +196,7 @@ route[MEDIA_SERVER_DOWN]
route[MEDIA_SERVER_RESTART]
{
xlog("L_WARNING", "htable|media|media server $var(MediaUrl) restarted in zone $var(Zone)\n");
#!ifdef PRESENCE_ROLE
route(RESET_PUBLISHER);
#!endif
@ -235,7 +235,7 @@ route[LISTENER_STATUS]
} else {
$var(advertise) = "";
}
$var(x) = $_s("$var(uri)" : {"proto" : "$var(proto)", "address" : "$var(address)", "port" : $var(port) $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) = " , ";


+ 2
- 2
kamailio/presence-query.cfg View File

@ -2,7 +2,7 @@
route[PRESENCE_SEARCH_SUMMARY]
{
xlog("L_INFO", "processing presence summary query for $(kzE{kz.json,Realm})\n");
xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|query|processing presence summary query for $(kzE{kz.json,Realm})\n");
$var(Queue) = $(kzE{kz.json,Server-ID});
$var(Event) = $(kzE{kz.json,Event-Package});
$var(Domain) = $(kzE{kz.json,Realm});
@ -54,7 +54,7 @@ route[PRESENCE_SEARCH_SUMMARY]
route[PRESENCE_SEARCH_DETAIL]
{
xlog("L_INFO", "processing presence query detail for $(kzE{kz.json,Username}) in realm $(kzE{kz.json,Realm})\n");
xlog("L_INFO", "$(kzE{kz.json,Msg-ID})|query|processing presence query detail for $(kzE{kz.json,Username}) in realm $(kzE{kz.json,Realm})\n");
$var(Queue) = $(kzE{kz.json,Server-ID});
$var(Msg-ID) = $(kzE{kz.json,Msg-ID});
$var(Event) = $(kzE{kz.json,Event-Package});


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

@ -97,7 +97,7 @@ route[HANDLE_SUBSCRIBE]
&& $hdr(Event) != "message-summary") {
xlog("L_INFO", "$ci|presence|subscribe event $hdr(Event) not supported\n");
send_reply(489, "Bad Event");
exit();
exit();
}
if (!t_newtran()) {
@ -137,7 +137,7 @@ route[DELETE_DUPLICATED_SUBSCRIPTIONS]
route[HANDLE_RESUBSCRIBE]
{
if(handle_subscribe()) {
if($subs(remote_cseq) < 5) {
$sht(first=>$subs(callid)) = $null;
@ -210,7 +210,7 @@ route[REQUEST_PROBE]
{
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") {
$var(mwi) = $tU;
route(REQUEST_MWI);
@ -248,7 +248,7 @@ route[HANDLE_PUBLISH]
&& $hdr(Event) != "message-summary") {
xlog("L_INFO", "$ci|presence|publish event $hdr(Event) not supported\n");
send_reply(489, "Bad Event");
exit();
exit();
}
if (!t_newtran()) {
@ -380,9 +380,9 @@ event_route[kazoo:consumer-event-presence-mwi-update]
}
#!else
xlog("L_DEBUG", "$(var(payload){kz.json,Call-ID})|log|skip mwi update for $var(presentity)\n");
#!endif
#!endif
}
route(MWI_AS_PRESENCE);
xlog("L_DBG", "$(kzE{kz.json,Call-ID})|log|message-summary update for $(kzE{kz.json,From}) light should be on ? $(kzE{kz.json,Messages-Waiting}) at $(kzE{kz.json,AMQP-Received})/$var(Now)/$TS\n");
@ -402,8 +402,8 @@ event_route[kazoo:consumer-event-presence-update]
$var(presentity) = $_s(sip:$(kzE{kz.json,Presence-ID}));
$var(payload) = $kzE;
route(PRESENCE_UPDATE);
xlog("L_DEBUG", "$(kzE{kz.json,Call-ID})|log|$(kzE{kz.json,Event-Package}) update for $(kzE{kz.json,From}) state $(kzE{kz.json,State}) from $(kzE{kz.json,Switch-URI}) Δ at $(kzE{kz.json,AMQP-Received})/$var(Now)/$TS\n");
xlog("L_DEBUG", "$(kzE{kz.json,Call-ID})|log|$(kzE{kz.json,Event-Package}) update for $(kzE{kz.json,From}) state $(kzE{kz.json,State}) from $(kzE{kz.json,Switch-URI}) Δ at $(kzE{kz.json,AMQP-Received})/$var(Now)/$TS\n");
}
route[PRESENCE_UPDATE]
@ -418,7 +418,7 @@ route[PRESENCE_UPDATE]
( $(var(payload){kz.json,State}) == "early" ||
($(var(payload){kz.json,State}) == "confirmed" && $(var(payload){kz.json,State}) == "initiator")
)) {
xlog("L_WARN", "$(var(payload){kz.json,Call-ID})|log|not publishing state $(var(payload){kz.json,State}) for presentity $var(presentity) with $xavp(watchers=>self) calls, policy limit of $sel(cfg_get.kazoo.presence_max_call_per_presentity) calls per presentity \n");
xlog("L_WARN", "$(var(payload){kz.json,Call-ID})|log|not publishing state $(var(payload){kz.json,State}) for presentity $var(presentity) with $xavp(watchers=>self) calls, policy limit of $sel(cfg_get.kazoo.presence_max_call_per_presentity) calls per presentity \n");
} else {
if($xavp(watchers=>dialog) > 0) {
if($(var(payload){kz.json,State}) == "terminated") {
@ -443,7 +443,7 @@ route[PRESENCE_UPDATE]
xlog("L_DEBUG", "$(var(payload){kz.json,Call-ID})|log|skip dialog update for $var(presentity)\n");
#!endif
}
if($xavp(watchers=>presence) > 0) {
xlog("L_DEBUG", "$(var(payload){kz.json,Call-ID})|log|publishing $var(presentity) presence update for $xavp(watchers=>presence) watchers\n");
kazoo_pua_publish_presence($var(payload));
@ -497,7 +497,7 @@ route[MWI_AS_PRESENCE]
route[PRESENCE_BINDINGS]
{
#!import_file "presence-custom-bindings.cfg"
#!ifndef PRESENCE_CUSTOM_BINDINGS
$var(payload) = $_s({ "name" : "presence", "exchange" : "presence", "type" : "topic", "queue" : "presence-dialog-MY_HOSTNAME", "routing" : ["dialog.*.*", "update.*.*", "mwi_updates.*.*"], "exclusive" : 0, "federate" : 1 });
kazoo_subscribe("$var(payload)");
@ -514,7 +514,7 @@ route[PRESENCE_BINDINGS]
route[PRESENCE_API_BINDINGS]
{
#!import_file "presence-api-custom-bindings.cfg"
#!ifndef PRESENCE_API_CUSTOM_BINDINGS
$var(payload) = $_s({"name": "presence-api", "exchange": "presence", "type": "topic", "queue": "presence-api-MY_HOSTNAME", "routing": ["presence.search_req.*", "presence.reset.*.*"], "exclusive": 0, "federate": 1 });
kazoo_subscribe("$var(payload)");


+ 5
- 5
kamailio/pusher-role.cfg View File

@ -66,7 +66,7 @@ route[PUSHER_PREPARE_PUSH]
route[PUSHER_PREPARE_PUSH_PAYLOAD]
{
$var(TokenID) = $hdr(X-KAZOO-PUSHER-Token-ID);
$var(TokenType) = $hdr(X-KAZOO-PUSHER-Token-Type);
$var(TokenApp) = $hdr(X-KAZOO-PUSHER-Token-App);
@ -90,13 +90,13 @@ route[PUSHER_PREPARE_PUSH_PAYLOAD]
$var(from_user) = $(hdr(From){tobody.user});
$var(from_name) = $(hdr(From){tobody.display}{re.subst,/"//g});
}
$var(from) = $_s($var(from_user) - $var(from_name));
$var(PushPayload) = $_s({"call-id" : "$ci", "proxy" : "$var(TokenProxy)", "caller-id-number" : "$var(from_user)", "caller-id-name" : "$var(from_name)", "registration-token" : "$var(TokenReg)"});
$var(Payload) = $_s({ "Event-Category" : "notification", "Event-Name" : "push_req", "Call-ID" : "$ci", "Token-ID" : "$var(TokenID)", "Token-Type" : "$var(TokenType)", "Token-App" : "$var(TokenApp)", "Alert-Key" : "IC_SIL", "Alert-Params" : ["$var(from)"], "Sound" : "ring.caf", "Payload" : $var(PushPayload) });
$avp(push_routing_key) = "notification.push." + $var(TokenType) + "." + $var(TokenID);
$avp(push_payload) = $var(Payload);
}
@ -163,8 +163,8 @@ route[PUSHER_ATTEMPT_REGISTRATION]
route[PUSHER_ON_REGISTRATION]
{
if( ( $(xavp(ulattrs=>x_token_reg){s.len}) > 0 ||
$(xavp(ulattrs=>custom_channel_vars){kz.json,Pusher-Application}{s.len}) > 0) &&
if( ( $(xavp(ulattrs=>x_token_reg){s.len}) > 0 ||
$(xavp(ulattrs=>custom_channel_vars){kz.json,Pusher-Application}{s.len}) > 0) &&
$var(Status) == "Registered") {
if($sht(push_cache=>$(tu{s.tolower})) != $null) {
xlog("L_INFO", "$ci|pusher|device registered, delivering the call\n");


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

@ -96,9 +96,9 @@ route[HANDLE_REGISTER]
resetbflag(FLB_NATSIPPING);
if (isflagset(FLT_NATS)) {
setbflag(FLB_NATB);
setbflag(FLB_NATB);
fix_nated_register();
## KAZOO-1846: Cisco SPA8000 freaks out on options pings
if (!($ua =~ "Linksys/SPA8000"
|| $ua =~ "SIPp"
@ -142,7 +142,7 @@ route[ATTEMPT_AUTHORIZATION]
route(PUSHER_ATTEMPT_REGISTRATION);
#!endif
if($sel(cfg_get.kazoo.registrar_force_query) == 0) {
if($sel(cfg_get.kazoo.registrar_force_query) == 0) {
$xavp(regcfg=>match_received) = $su;
if($sht(auth_cache=>$Au) != $null
&& registered("location", "$rz:$Au", 2, 1) == 1
@ -326,7 +326,7 @@ route[SAVE_LOCATION]
default:
$var(port) = $Rp;
}
$var(AdvIP) = $RAi;
if(af==INET6) {
$var(AdvIP) = "[" + $RAi + "]";
@ -399,7 +399,7 @@ route[REGISTRAR_BOUNDS]
send_reply("400", "Missing Expires");
exit;
}
if($var(expires) != 0) {
if($var(expires) < REGISTRAR_MIN_EXPIRES) {
$var(expires) = REGISTRAR_MIN_EXPIRES;
@ -408,12 +408,12 @@ route[REGISTRAR_BOUNDS]
exit;
}
}
}
##
## this needs handling logic in ecallmgr
## because we will fire the unregister from this server
## this needs handling logic in ecallmgr
## because we will fire the unregister from this server
## after device registers in another proxy
## causing ecallmgr to delete the registration
## from the other server
@ -481,7 +481,7 @@ route[REGISTRAR_ROUTE_TO_AOR]
if ($hdr(X-KAZOO-AOR) == $null) {
return();
}
xlog("L_INFO", "$ci|log|using AOR $hdr(X-KAZOO-AOR)\n");
setflag(FLT_AOR);
if ($hdr(X-KAZOO-INVITE-FORMAT) == "contact") {


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

@ -33,7 +33,7 @@ route[HANDLE_WEBSOCKETS]
# connection - even if it is not behind a NAT!
# This won't be needed in the future if Kamailio and the
# WebSocket client support Outbound and Path.
return();
}


Loading…
Cancel
Save