[Freeswitch-svn] [commit] r10350 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua

[FreeSWITCH SVN]

Author: anthm
Date: Wed Nov 12 06:58:43 2008
New Revision: 10350

Log:

Tue Oct  2 11:30:47 EDT 2007  Mikhail Zabaluev <mikhail.zabaluev at nokia.com>
  * outbound.c: Retain keepalives even when 'natify' is disabled


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




Modified:
   freeswitch/trunk/libs/sofia-sip/.update
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c

Modified: freeswitch/trunk/libs/sofia-sip/.update
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/.update	(original)
+++ freeswitch/trunk/libs/sofia-sip/.update	Wed Nov 12 06:58:43 2008
@@ -1 +1 @@
-Wed Nov 12 11:22:49 EST 2008
+Wed Nov 12 11:25:43 EST 2008

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c	Wed Nov 12 06:58:43 2008
@@ -669,7 +669,7 @@
 
   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 */