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
This commit is contained in:
Anthony Minessale 2008-11-12 11:58:43 +00:00
parent d7621a4135
commit 834397d025
2 changed files with 2 additions and 2 deletions

View File

@ -1 +1 @@
Wed Nov 12 11:22:49 EST 2008
Wed Nov 12 11:25:43 EST 2008

View File

@ -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 */