Tue Oct 2 11:30:47 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev@nokia.com>

  * outbound.c: Retain keepalives even when 'natify' is disabled

Mon Oct  6 09:02:14 EDT 2008  Mikhail Zabaluev <mikhail.zabaluev@nokia.com>
  * Resolved a conflict in outbound.c with the natify patch

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10350 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 852d4417fb852c0b764c755036f5c186e51b0e47..b79941dca321cc55af4ce3f63f77860ecce63215 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Nov 12 11:22:49 EST 2008
+Wed Nov 12 11:25:43 EST 2008

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c b/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c
index f9f571278e41d0dbed8cd208dada18825cbef98d..cf4f772222e307a39ef2e045058d4099ba73bd66 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c
@@ -669,7 +669,7 @@ void outbound_start_keepalive(outbound_t *ob,
 
   udp = ob->ob_via && ob->ob_via->v_protocol == sip_transport_udp;
 
-  if (ob->ob_prefs.natify &&
+  if (/* ob->ob_prefs.natify && */
       /* On UDP, use OPTIONS keepalive by default */
       (udp ? ob->ob_prefs.okeepalive != 0
        /* Otherwise, only if requested */