From 834397d02535c9e2282f692a42a79c0908fe6d25 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Wed, 12 Nov 2008 11:58:43 +0000
Subject: [PATCH] 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
---
libs/sofia-sip/.update | 2 +-
libs/sofia-sip/libsofia-sip-ua/nua/outbound.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 852d4417fb..b79941dca3 100644
--- 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 f9f571278e..cf4f772222 100644
--- 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 */