Merge remote-tracking branch 'origin/master' into 4.1

kamailio/default.cfg

@@ -87,6 +87,9 @@ dns_srv_lb = off
 ####### SCTP Parameters #########
 disable_sctp = yes
 
+######## Kamailio mqueue module ########
+loadmodule "mqueue.so"
+
 ######## Kamailio outbound module ########
 loadmodule "outbound.so"
 
@@ -601,7 +604,15 @@ route[INTERNAL_TO_EXTERNAL_RELAY]
     #!ifdef REGISTRAR_ROLE
     if ($hdr(X-KAZOO-AOR) != $null) {
         xlog("L_INFO", "$ci|log|using AOR $hdr(X-KAZOO-AOR)\n");
-        if (reg_fetch_contacts("location", "$hdr(X-KAZOO-AOR)", "callee")) {
+        if ($hdr(X-KAZOO-INVITE-FORMAT) == "contact") {
+            if(lookup("location", "$hdr(X-KAZOO-AOR)") > 0){
+                xlog("L_INFO", "$ci|end|routing to contact $ru\n");
+            } else {
+                xlog("L_INFO", "$ci|end|lookup for AOR $hdr(X-KAZOO-AOR) failed\n");
+                sl_send_reply("404", "Not registered");
+                exit;
+            }
+        } else if (reg_fetch_contacts("location", "$hdr(X-KAZOO-AOR)", "callee")) {
             $du = $(ulc(callee=>received));
             $fs = $(ulc(callee=>socket));
             xlog("L_INFO", "$ci|log|routing $hdr(X-KAZOO-AOR) to $du via $fs\n");
@@ -614,13 +625,6 @@ route[INTERNAL_TO_EXTERNAL_RELAY]
     #!endif
 
     remove_hf_re("^X-.*");
-    
-    if( $avp(kazoo_aor) != $null)
-    {
-       $du = $avp(kazoo_du);
-       xlog("L_INFO", "$ci|end|routing to $ruid : AOR : $avp(kazoo_aor)\n");
-    }
-    
 
     t_on_reply("EXTERNAL_REPLY");
 

kamailio/nodes-role.cfg

@@ -21,11 +21,6 @@ modparam("timer", "declare_timer", "NODE_TRACK_TIMER=NODE_TRACK_ROUTE,500,fast,e
 modparam("timer", "declare_timer", "NODE_HEARTBEAT_TIMER=NODE_HEARTBEAT_ROUTE,500,fast,enable");
 
 
-####### MQUEUE module ##########
-#!ifndef MQUEUE_LOADED
-loadmodule "mqueue.so"
-#!trydef MQUEUE_LOADED
-#!endif
 modparam("mqueue","mqueue", "name=node_track")
 modparam("mqueue","mqueue", "name=node_heartbeat")
 

kamailio/presence_notify_sync-role.cfg

@@ -33,11 +33,6 @@ route[PRESENCE_LOCAL_NOTIFY]
     }
 }
 
-####### MQUEUE module ##########
-#!ifndef MQUEUE_LOADED
-loadmodule "mqueue.so"
-#!trydef MQUEUE_LOADED
-#!endif
 modparam("mqueue","mqueue", "name=presence_last_notity")
 
 #!ifndef TIMER_LOADED

kamailio/traffic-filter-role.cfg

@@ -37,7 +37,7 @@ route[FILTER_AUTHORIZATION_DOMAIN]
     }
 }
 
-route[FILTER_TO_DOMAIN]
+route[FILTER_FROM_DOMAIN]
 {
     if ($fd =~ "([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})") {
         xlog("L_WARN", "$ci|end|dropping request with IP domain in From header\n");
@@ -46,7 +46,7 @@ route[FILTER_TO_DOMAIN]
     }
 }
 
-route[FILTER_FROM_DOMAIN]
+route[FILTER_TO_DOMAIN]
 {
     if ($td =~ "([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})") {
         xlog("L_WARN", "$ci|end|dropping request with IP domain in To header\n");