From cda462bdaa6d09bb292b3db68c1e107b92dd1924 Mon Sep 17 00:00:00 2001
From: bitbashing <bitbashing@gmail.com>
Date: Mon, 6 Feb 2017 15:37:42 -0800
Subject: [PATCH] =?UTF-8?q?remove=20newtran=20because=20it=20causes=20the?=
 =?UTF-8?q?=20202=20to=20go=20to=20the=20contact=20and=20not=E2=80=A6=20(#?=
 =?UTF-8?q?137)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* remove newtran because it causes the 202 to go to the contact and not the nat corrected port

* remove left behind t_release

* remove the timeout_rm_subs parameter until we updated to kamailio that allows handling timeout_rm_subs in the event_route
---
 kamailio/presence-role.cfg             | 9 ---------
 kamailio/presence_notify_sync-role.cfg | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/kamailio/presence-role.cfg b/kamailio/presence-role.cfg
index 8b16a7a..577c7e4 100644
--- a/kamailio/presence-role.cfg
+++ b/kamailio/presence-role.cfg
@@ -41,28 +41,20 @@ route[HANDLE_SUBSCRIBE]
         route(NAT_TEST_AND_CORRECT);
         #!endif
 
-        if (!t_newtran()) {
-            sl_reply_error();
-            exit;
-        }
-
         if ($tU == $null) {
             xlog("L_INFO", "$ci|stop|ignoring subscribe with empty TO username from a $ua\n");
             sl_send_reply(400, "Missing TO username");
-            t_release();
             exit;
         }
 
         if ($fU == $null) {
             xlog("L_INFO", "$ci|stop|ignoring subscribe with empty FROM username from a $ua\n");
             sl_send_reply(400, "Missing FROM username");
-            t_release();
             exit;
         }
 
         if (!handle_subscribe()) {
             xlog("L_INFO", "$ci|stop|unsupported subsribe\n");
-            t_release();
             exit;
         }
 
@@ -84,7 +76,6 @@ route[HANDLE_SUBSCRIBE]
 
         kazoo_publish("dialoginfo_subs", "dialoginfo_subs", $var(amqp_payload_request));                 
 
-        t_release();
         exit;
     }
 }
diff --git a/kamailio/presence_notify_sync-role.cfg b/kamailio/presence_notify_sync-role.cfg
index 5d62c50..770d19f 100644
--- a/kamailio/presence_notify_sync-role.cfg
+++ b/kamailio/presence_notify_sync-role.cfg
@@ -1,5 +1,5 @@
 kazoo.presence_notify = 1 descr "enable/disable sending notify callback to omnipresence"
-kazoo.presence_notify_timeout = 1000 descr "timeout in ms waiting for notify reply"
+kazoo.presence_notify_timeout = 3000 descr "timeout in ms waiting for notify reply"
 kazoo.presence_notify_log_body = 0 descr "logs the body sent in the notification"
 kazoo.presence_notify_log_resp_body = 0 descr "logs the body received from notification"
 kazoo.presence_notify_log_to_table = 0 descr "logs notify/reply to active_watchers_log table"