From a80e534b0792649c374680e10f270f1daf445978 Mon Sep 17 00:00:00 2001
From: dschreiber <d@d-man.org>
Date: Mon, 26 Dec 2011 19:00:24 -0500
Subject: [PATCH 1/3] Rename SIP Profiles to internal.xml

---
 sip_profiles/{sipinterface_1.xml => internal.xml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sip_profiles/{sipinterface_1.xml => internal.xml} (100%)

diff --git a/sip_profiles/sipinterface_1.xml b/sip_profiles/internal.xml
similarity index 100%
rename from sip_profiles/sipinterface_1.xml
rename to sip_profiles/internal.xml

From 26073b496e1a494837c51f435c8ff99d40a740b6 Mon Sep 17 00:00:00 2001
From: dschreiber <d@d-man.org>
Date: Mon, 26 Dec 2011 19:00:39 -0500
Subject: [PATCH 2/3] Conferences in HD!

---
 autoload_configs/conference.conf.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoload_configs/conference.conf.xml b/autoload_configs/conference.conf.xml
index 8add428..e1dbace 100644
--- a/autoload_configs/conference.conf.xml
+++ b/autoload_configs/conference.conf.xml
@@ -3,9 +3,9 @@
 
     <profiles>
         <profile name="default">
-            <param name="rate" value="8000"/>
+            <param name="rate" value="16000"/>
             <param name="interval" value="20"/>
-            <param name="energy-level" value="300"/>
+            <param name="energy-level" value="20"/>
             <!--<param name="member-flags" value="waste"/>-->
             <param name="caller-controls" value="none"/>
             <param name="sound-prefix" value=""/>

From ed461f5b8fceaa1101d1fdebf22486c6bbc19bb7 Mon Sep 17 00:00:00 2001
From: K Anderson <karl@2600hz.com>
Date: Fri, 30 Dec 2011 18:49:19 -0800
Subject: [PATCH 3/3] WHISTLE-818: track failure attempts and terminate retries
 after 3

---
 opensips/opensips.tmp | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/opensips/opensips.tmp b/opensips/opensips.tmp
index 18866c1..a115ee6 100644
--- a/opensips/opensips.tmp
+++ b/opensips/opensips.tmp
@@ -52,7 +52,7 @@ tos=IPTOS_LOWDELAY
 mcast_loopback=no
 mcast_ttl=1
 mhomed=0
-# tcp_accept_aliases
+tcp_accept_aliases=yes
 tcp_connect_timeout=3
 tcp_connection_lifetime=120
 tcp_max_connections=2048
@@ -860,7 +860,7 @@ 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("(401)|(407)"))
+    if (t_check_status("(401)|(407)|(403)"))
     {
         xlog("L_INFO", "$ci|log|failure route ignoring auth reply $T_reply_code $rr");
     }
@@ -874,8 +874,19 @@ failure_route[internal_fault]
     {
         xlog("L_INFO", "$ci|start|received failure reply $T_reply_code $rr");
 
+        if (cache_fetch("local", "$ci-failure", $avp(i:55)))
+        {
+            $avp(i:55) = $(avp(i:55){s.int});
+        }
+        else
+        {
+            $avp(i:55) = 0;
+        }
+
+        xlog("L_INFO", "$ci|log|attempting retry $avp(i:55) of failed request");
+
         # try to find a new media server to send the call to
-        if(ds_next_domain())
+        if($avp(i:55) < 3 && ds_next_domain())
         {
             xlog("L_INFO", "$ci|log|routing call to next media server $rd:$rp");
 
@@ -903,10 +914,16 @@ failure_route[internal_fault]
             # relay the request to the new media server
             t_relay();
 
+            $avp(i:55) = $avp(i:55) + 1;
+
+            cache_store("local", "$ci-failure", "$avp(i:55)", 60);
+
             exit();
         }
         else
         {
+            cache_remove("local", "$ci-failure");
+
             xlog("L_ERR", "$ci|log|no other media servers avaliable");
         }
     }
@@ -945,6 +962,6 @@ failure_route[internal_fault]
     # the winning reply will be sent back to UAC.
 }
 
+
 # For VIM:
 # vim: set expandtab softtabstop=4 shiftwidth=2 tabstop=2:
-