diffs from dev

opensips/opensips.cfg

@@ -138,7 +138,7 @@ modparam("sl", "enable_stats", 1)
 ## SIP Transaction UA Module Parameters
 ######################################################################
 modparam("tm", "fr_timer", 2)
-modparam("tm", "fr_inv_timer", 60)
+modparam("tm", "fr_inv_timer", 120)
 # modparam("tm", "wt_timer", 5)
 # modparam("tm", "delete_timer", 2)
 # modparam("tm", "T1_timer", 500)
@@ -146,9 +146,9 @@ modparam("tm", "fr_inv_timer", 60)
 # modparam("tm", "ruri_matching", 1)
 # modparam("tm", "via1_matching", 1)
 # modparam("tm", "unix_tx_timeout", 2)
-modparam("tm", "restart_fr_on_each_reply", 1)
-# modparam("tm", "fr_timer_avp", "$avp(i:24)")
-# modparam("tm", "fr_inv_timer_avp", "$avp(i:25)")
+# modparam("tm", "restart_fr_on_each_reply", 1)
+modparam("tm", "fr_timer_avp", "$avp(s:final_reply_timer)")
+# modparam("tm", "fr_inv_timer_avp", "$avp(s:final_reply_prov)")
 # modparam("tm", "tw_append",
 #    "test: ua=$hdr(User-Agent) ;avp=$avp(i:10);$rb;time=$Ts")
 modparam("tm", "pass_provisional_replies", 1)
@@ -267,7 +267,7 @@ modparam("mi_fifo", "fifo_name", "/tmp/opensips_fifo")
 ######################################################################
 ## MI-Datagram Module Parameters
 ######################################################################
-# modparam("mi_datagram", "socket_name", "udp:10.180.180.230:8889")
+# modparam("mi_datagram", "socket_name", "udp:127.0.0.1:8889")
 # modparam("mi_datagram", "children_count", 1)
 # modparam("mi_datagram", "unix_socket_mode", 0600)
 # modparam("mi_datagram", "unix_socket_group", "root")
@@ -324,14 +324,14 @@ route
 
     if (ds_is_in_list("$si", "$sp", "1") || ds_is_in_list("$si", "$sp", "2"))
     {           
-        xlog("L_INFO", "$ci|log|originated from internal source");
+        xlog("L_INFO", "$ci|log|inception on-net");
 
-        # Flag 26 marks the source as a interal server   
+        # Flag 26 marks the source as a on-net server   
         setflag(26);
     }
     else
     {
-        xlog("L_INFO", "$ci|log|originated from external source");
+        xlog("L_INFO", "$ci|log|inception off-net");
     }
 
     if (has_totag())
@@ -487,13 +487,17 @@ route[1]
 
         append_hf("X-AUTH-IP: $si\r\n");
 
-        t_on_reply("internal_reply");
+        $avp(s:final_reply_timer) = 2;
+
+        t_on_reply("on_net_reply");
 
-        t_on_failure("internal_fault");
+        t_on_failure("on_net_fault");
     }
     else
     {
-        t_on_reply("external_reply");
+        $avp(s:final_reply_timer) = 6;
+
+        t_on_reply("off_net_reply");
     }
 
     if (!t_relay())
@@ -537,9 +541,9 @@ route[nat_test_and_correct]
     }
 }
 
-onreply_route[external_reply]
+onreply_route[off_net_reply]
 {
-    xlog("L_INFO", "$ci|start|recieved external reply $rs $rr");
+    xlog("L_INFO", "$ci|start|recieved off-net reply $rs $rr");
     xlog("L_INFO", "$ci|log|source $si:$sp");
 
     route("nat_test_and_correct");
@@ -547,9 +551,9 @@ onreply_route[external_reply]
     xlog("L_INFO", "$ci|pass|$(<request>si)");
 }
 
-onreply_route[internal_reply]
+onreply_route[on_net_reply]
 {
-    xlog("L_INFO", "$ci|start|recieved internal reply $rs $rr");
+    xlog("L_INFO", "$ci|start|recieved on-net reply $rs $rr");
     xlog("L_INFO", "$ci|log|source $si:$sp");
 
     route("nat_test_and_correct");
@@ -564,7 +568,7 @@ onreply_route[internal_reply]
     xlog("L_INFO", "$ci|pass|$(<request>si)");
 }
 
-failure_route[internal_fault]
+failure_route[on_net_fault]
 {
     if (t_was_cancelled()) 
     {
@@ -595,6 +599,8 @@ failure_route[internal_fault]
 
             xlog("L_INFO", "$ci|pass|$rd");
 
+            $avp(s:final_reply_timer) = 2;
+
             t_relay();
 
             exit;