From de4916443a0511a5ea4adeeb16cb136c48c89b71 Mon Sep 17 00:00:00 2001
From: karl anderson <karl@2600hz.com>
Date: Sat, 22 Jun 2013 12:15:04 -0700
Subject: [PATCH 1/4] handle NAT during registration challenge

---
 kamailio/kamailio.cfg | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/kamailio/kamailio.cfg b/kamailio/kamailio.cfg
index cc770ec..d4034e4 100644
--- a/kamailio/kamailio.cfg
+++ b/kamailio/kamailio.cfg
@@ -354,6 +354,16 @@ route[PREPARE_INITIAL_REQUESTS]
     }
 
     if (is_method("REGISTER")) {
+        if (nat_uac_test("3")) {
+            xlog("L_INFO", "$ci|log|Correcting NATed contact in registration\n");
+            force_rport();
+
+            setbflag(FLB_NATB);
+            setbflag(FLB_NATSIPPING);
+
+            fix_nated_register();
+        }
+
         if (is_present_hf("Authorization")) {
             if ($sht(auth_cache=>$Au) != $null && pv_auth_check("$fd", "$sht(auth_cache=>$Au)", "0", "0")) {
                 xlog("L_INFO", "$ci|log|Authenticated $Au via cached SIP creds\n");
@@ -364,7 +374,7 @@ route[PREPARE_INITIAL_REQUESTS]
                     xlog("L_INFO", "$ci|log|Issued new auth challenge to failed registration attempt\n");
                     exit;
                 } else {
-                    xlog("$ci|log|Caching SIP credentials for $Au\n");
+                    xlog("L_INFO", "$ci|log|Caching SIP credentials for $Au\n");
                     $sht(auth_cache=>$Au) = $avp(password);
                 }
             }
@@ -377,16 +387,6 @@ route[PREPARE_INITIAL_REQUESTS]
         # user authenticated - remove auth header
         consume_credentials();
 
-        if (nat_uac_test("3")) {
-            xlog("L_INFO", "$ci|log|Correcting NATed contact in registration\n");
-            force_rport();
-
-            setbflag(FLB_NATB);
-            setbflag(FLB_NATSIPPING);
-
-            fix_nated_register();
-        }
-
         save("location");
         exit;
     } else if (!is_method("MESSAGE")) {

From 24fd879d59f64c594d9c080ee9b10acc583b1777 Mon Sep 17 00:00:00 2001
From: karl anderson <karl@2600hz.com>
Date: Wed, 3 Jul 2013 13:50:31 -0700
Subject: [PATCH 2/4] fix broken path

---
 kamailio/kamailio.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kamailio/kamailio.cfg b/kamailio/kamailio.cfg
index 1f479d5..901228c 100644
--- a/kamailio/kamailio.cfg
+++ b/kamailio/kamailio.cfg
@@ -186,7 +186,7 @@ modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 
 ####### Dispatcher module  ########
 loadmodule "dispatcher.so"
-modparam("dispatcher", "list_file", "/etc/kamailio/dispatcher.list")
+modparam("dispatcher", "list_file", "/etc/kazoo/kamailio/dispatcher.list")
 modparam("dispatcher", "flags", 2)
 modparam("dispatcher", "use_default", 0)
 modparam("dispatcher", "force_dst", 1)

From a85d2c3e803c3ef80c43621310b8534f6cb741cf Mon Sep 17 00:00:00 2001
From: Jeremy Ai <jeremy.ai@2600hz.com>
Date: Fri, 12 Jul 2013 14:13:50 -0700
Subject: [PATCH 3/4] Update config.ini

Commented out bigcouch user/password
---
 config.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.ini b/config.ini
index 7a98c5f..f957b5b 100644
--- a/config.ini
+++ b/config.ini
@@ -9,8 +9,8 @@ compact_automatically = true
 cookie = change_me
 ip = "127.0.0.1"
 port = 15984
-username = "kazoo"
-password = "supermegaexcellenttelephonyplatform"
+; username = "kazoo"
+; password = "supermegaexcellenttelephonyplatform"
 admin_port = 15986
 
 [whistle_apps]

From f87316558aa7376304f02e144fa4e7248de7efa5 Mon Sep 17 00:00:00 2001
From: karl anderson <karl@2600hz.com>
Date: Wed, 3 Jul 2013 17:22:27 -0700
Subject: [PATCH 4/4] change the kamailio group

---
 kamailio/kamailio.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kamailio/kamailio.cfg b/kamailio/kamailio.cfg
index 901228c..36d6f4f 100644
--- a/kamailio/kamailio.cfg
+++ b/kamailio/kamailio.cfg
@@ -18,7 +18,7 @@
 ####### Global Parameters #########
 fork = yes
 children = 25
-group = daemon
+group = kamailio
 user = kamailio
 server_signature = no
 server_header = "Server: Kazoo"
@@ -119,7 +119,7 @@ modparam("pua_dialoginfo", "library_mode", 1)
 
 # TODO: ARE THESE NECESSARY
 loadmodule "corex.so"
-loadmodule "ctl.so"
+# loadmodule "ctl.so"
 loadmodule "cfg_rpc.so"
 loadmodule "mi_rpc.so"