Commit d1f20120 authored by Mikhail Zabaluev's avatar Mikhail Zabaluev

Resolved a conflict in outbound.c with the natify patch

darcs-hash:20081006130214-5b6ca-64046029248cd0c0f7c878331d36ca57927edb8d.gz
parent e02f3ff6
......@@ -667,7 +667,13 @@ void outbound_start_keepalive(outbound_t *ob,
if (!ob)
return;
if (ob->ob_prefs.natify && ob->ob_prefs.okeepalive)
udp = ob->ob_via && ob->ob_via->v_protocol == sip_transport_udp;
if (/* ob->ob_prefs.natify && */
/* On UDP, use OPTIONS keepalive by default */
(udp ? ob->ob_prefs.okeepalive != 0
/* Otherwise, only if requested */
: ob->ob_prefs.okeepalive > 0))
interval = ob->ob_prefs.interval;
need_to_validate = ob->ob_prefs.validate && !ob->ob_validated;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment