Merge branch 'master' into github

autoload_configs/modules.conf.xml

@@ -32,8 +32,8 @@
         <!--<load module="mod_g723_1"/>-->
         <!--<load module="mod_amr"/>-->
         <!--<load module="mod_ilbc"/>-->
-        <!--<load module="mod_speex"/>-->
-        <!--<load module="mod_h26x"/>-->
+        <load module="mod_speex"/>
+        <load module="mod_h26x"/>
         <!--<load module="mod_celt"/>-->
         <!--<load module="mod_opus"/>-->
 

freeswitch.xml

@@ -34,9 +34,7 @@
     <X-PRE-PROCESS cmd="set" data="ignore_display_updates=true"/>
     <X-PRE-PROCESS cmd="set" data="recordings_dir=/tmp/"/>
 
-    <!--<X-PRE-PROCESS cmd="set" data="codecs=G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>-->
-    <!--<X-PRE-PROCESS cmd="set" data="codecs=G729,PCMU,PCMA,GSM"/>-->
-    <X-PRE-PROCESS cmd="set" data="codecs=G729,PCMU,PCMA,GSM"/>
+    <X-PRE-PROCESS cmd="set" data="codecs=H261,H263,H264,G7221@32000h,G7221@16000h,G722,PCMU,PCMA,GSM"/>
 
     <section name="configuration" description="Various Configuration">
         <X-PRE-PROCESS cmd="include" data="autoload_configs/*.xml"/>

opensips/opensips.tmp

@@ -270,8 +270,8 @@ modparam("dispatcher", "ds_ping_from", "sip:sipcheck@{{SIP_IP}}:{{SIP_PORT}}")
 modparam("dispatcher", "ds_ping_interval", 10)
 # modparam("dispatcher", "ds_ping_sock", "udp:{{SIP_IP}}:{{SIP_PORT}}")
 modparam("dispatcher", "ds_probing_threshhold", 3)
-modparam("dispatcher", "ds_probing_mode", 0)
-modparam("dispatcher", "options_reply_codes", "501, 403, 404, 400")
+modparam("dispatcher", "ds_probing_mode", 1)
+modparam("dispatcher", "options_reply_codes", "501,403,404,400,200")
 
 ######################################################################
 ## MI-FIFO Module Parameters
@@ -738,7 +738,6 @@ onreply_route[external_reply]
 {
     # this branch handles replies that are comming from equipment
     # outside our control
-
     xlog("L_INFO", "$ci|start|recieved external reply $T_reply_code $rr");
     xlog("L_INFO", "$ci|log|source $si:$sp");
 
@@ -792,16 +791,8 @@ onreply_route[external_reply]
 
 onreply_route[internal_reply]
 {
-    # this branch handles replies that are comming from our media server
-    if(t_local_replied("last"))
-    {
-        xlog("L_INFO", "$ci|start|recieved local internal reply $T_reply_code $rr");
-    }
-    else
-    {
-        xlog("L_INFO", "$ci|start|recieved internal reply $T_reply_code $rr");
-        xlog("L_INFO", "$ci|log|source $si:$sp");
-    }
+    xlog("L_INFO", "$ci|start|recieved internal reply $T_reply_code $rr");
+    xlog("L_INFO", "$ci|log|source $si:$sp");
 
     # Ensure that if we challenge an endpoint its response is not round-robin'd
     # We have to do it in the reply so we have the correct call id
@@ -854,13 +845,9 @@ failure_route[internal_fault]
 
     # if the failure case was soemthing that we should recover
     # from then try to find a new media server
-    if (t_check_status("(404)|(486)|(5[0-9][0-9])"))
+    if (t_check_status("(4[0-9][0,2-6,8-9])|(5[0-9][0-9])"))
     {
-        xlog("L_ERR", "$ci|log|moving media server $rd:$rp to probing mode");
-
-        # flag the media server that failed and start sending SIP pings
-        # when it begins responding put it back in the lsit
-        ds_mark_dst("p");
+        xlog("L_INFO", "$ci|start|received failure reply $T_reply_code $rr");
 
         # try to find a new media server to send the call to
         if(ds_next_domain())
@@ -898,6 +885,10 @@ failure_route[internal_fault]
             xlog("L_ERR", "$ci|log|no other media servers avaliable");
         }
     }
+    else
+    {       
+        xlog("L_INFO", "$ci|log|failure route ignoring reply $T_reply_code $rr");
+    }  
 
     if (!t_check_status("(407)|(401)"))
     {

sip_profiles/sipinterface_1.xml

@@ -146,9 +146,9 @@
 
 
             <!-- Subscription and Presence -->
-            <param name="manage-presence" value="false"/>
+            <param name="manage-presence" value="true"/>
             <!--<param name="delete-subs-on-register" value="false"/>-->
-            <!--<param name="manage-shared-appearance" value="true"/>-->
+            <param name="manage-shared-appearance" value="true"/>
             <!--<param name="dbname" value="share_presence"/>-->
             <!--<param name="presence-hosts" value=".2600hz.org"/>-->
             <!--<param name="force-subscription-expires" value="360"/>-->