From 54e60f8143c939797dc8c6e9fe9a27378e740923 Mon Sep 17 00:00:00 2001
From: karl anderson <karl@2600hz.com>
Date: Sat, 8 Mar 2014 21:01:27 -0800
Subject: [PATCH] fix hunt in the backup dispatcher list, fix tab-to-space and
 enable tls by default

---
 freeswitch/sip_profiles/sipinterface_1.xml | 16 ++++++++--------
 kamailio/dbtext/dispatcher                 |  1 +
 kamailio/dispatcher-role.cfg               |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/freeswitch/sip_profiles/sipinterface_1.xml b/freeswitch/sip_profiles/sipinterface_1.xml
index 6f8e38a..74fb7dc 100644
--- a/freeswitch/sip_profiles/sipinterface_1.xml
+++ b/freeswitch/sip_profiles/sipinterface_1.xml
@@ -68,8 +68,8 @@
             <param name="ext-rtp-ip" value="auto"/>
             <param name="rtp-timer-name" value="soft"/>
             <param name="rtp-autoflush-during-bridge" value="true"/>
-			<param name="rtp-rewrite-timestamps" value="false"/>
-			<param name="rtp-enable-zrtp" value="true"/>
+            <param name="rtp-rewrite-timestamps" value="false"/>
+            <param name="rtp-enable-zrtp" value="true"/>
             <!--<param name="disable-rtp-auto-adjust" value="true"/>-->
             <!--<param name="rtp-autofix-timing" value="false"/>-->
             <!--<param name="auto-rtp-bugs" data="clear"/>-->
@@ -90,13 +90,13 @@
 
 
             <!-- TLS -->
-            <!--<param name="tls" value="true"/>
-            <param name="tls-only" value="false"/>
+            <param name="tls" value="true"/>
+            <param name="tls-sip-port" value="11001"/>
+            <param name="tls-cert-dir" value="/etc/kazoo/freeswitch/certs"/>
+            <!--<param name="tls-only" value="false"/>
             <param name="tls-bind-params" value="transport=tls"/>
-            <param name="tls-sip-port" value="5070"/>
             <param name="tls-version" value="tlsv1"/>
             <param name="tls-bind-params" value="transport=tls"/>
-            <param name="tls-cert-dir" value="$${internal_ssl_dir}"/>
             <param name="tls-passphrase" value=""/>
             <param name="tls-verify-date" value="true"/>
             <param name="tls-verify-policy" value="none"/>
@@ -109,8 +109,8 @@
             <param name="dtmf-duration" value="960"/>
             <param name="rfc2833-pt" value="101"/>
             <param name="dtmf-type" value="rfc2833"/>
-			<param name="pass-rfc2833" value="false"/>
-			<param name="liberal-dtmf" value="true"/>
+            <param name="pass-rfc2833" value="false"/>
+            <param name="liberal-dtmf" value="true"/>
 
 
             <!-- Codecs -->
diff --git a/kamailio/dbtext/dispatcher b/kamailio/dbtext/dispatcher
index 12a5db7..f9e4194 100644
--- a/kamailio/dbtext/dispatcher
+++ b/kamailio/dbtext/dispatcher
@@ -7,3 +7,4 @@
 
 # setid(integer) destination(sip uri) flags (integer, optional)
 1 sip:127.0.0.1:11000 0
+3 sips:127.0.0.1:11001 0
diff --git a/kamailio/dispatcher-role.cfg b/kamailio/dispatcher-role.cfg
index 2ef0507..5202303 100644
--- a/kamailio/dispatcher-role.cfg
+++ b/kamailio/dispatcher-role.cfg
@@ -112,7 +112,7 @@ route[DISPATCHER_REORDER_ROUTES]
         $var(i) = $var(i) + 1;
     }
   
-    if (!$var(found) && ds_select_dst("2", "0")) {
+    if (!$var(found) && $var(ds_group) == 1 && ds_select_dst("2", "0")) {
         $var(i) = 0;
         while($(avp(ds_dst)[$var(i)]) != $null) {
             if($(avp(ds_dst)[$var(i)]) == $var(prefered_route)) {
@@ -120,6 +120,7 @@ route[DISPATCHER_REORDER_ROUTES]
                 $var(found) = 1;
                 break;
             }
+            $var(i) = $var(i) + 1;
         }        
     }