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

kamailio/default.cfg

@@ -344,10 +344,13 @@ route
 
 route[CHECK_RETRANS]
 {
-  # handle retransmissions
-    if(t_precheck_trans()) {
+    # handle retransmissions
+    if (!is_method("ACK")) {
+        if(t_precheck_trans()) {
+            t_check_trans();
+            exit;
+        }
         t_check_trans();
-        exit;
     }
 }
 

kamailio/fast-pickup-role.cfg

@@ -44,7 +44,12 @@ route[FAST_PICKUP_ATTEMPT]
        if(kazoo_query("callevt", $var(amqp_routing_key), $var(amqp_payload_request))) {
            $du = $(kzR{kz.json,Switch-URL});
            if($du != $null) {
-                xlog("L_INFO", "$ci|log|call-id $var(replaced_call_id) found redirecting call to $du\n");
+               if($(ru{uri.user}) =~ "\*") {
+                   xlog("L_INFO", "$ci|log|adding a-leg to replaces header\n");
+                   remove_hf_re("^Replaces");
+                   append_hf("Replaces: $var(replaced_call_id);a-leg=true\r\n");
+                }
+                xlog("L_INFO", "$ci|log|call-id $var(replaced_call_id) found redirecting call ($(ru{uri.user})) to $du\n");
                 route(EXTERNAL_TO_INTERNAL_RELAY);
                 exit();
            } else {

kamailio/presence-role.cfg

@@ -153,7 +153,7 @@ route[HANDLE_NEW_SUBSCRIBE]
 route[SUBSCRIBE_AMQP]
 {
     $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" : $sub(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));
 }
 

rabbitmq/enabled_plugins

@@ -1 +1 @@
-[rabbitmq_management].
+[rabbitmq_management, rabbitmq_consistent_hash_exchange].