[asterisk-commits] jrose: branch 1.8 r323371 - /branches/1.8/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Tue Jun 14 11:38:43 2011
New Revision: 323371

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=323371
Log:
Changes contact use in build_peer to use the FORCE_RPORT flag instead of RPORT_PRESENT

It turned out that this was causing NAT=Yes to always use rport when present which was
against 1.6.2 behavior and the check itself was redundant since the only way this
segment of code could be reached was if RPORT_PRESENT was already evaluated as true
earlier.

(closes issue ASTERISK-17789)
Reported by: byronclark
Patches: 
      use_sip_nat_force_rport.patch uploaded by byronclark (license 1200)

Modified:
    branches/1.8/channels/chan_sip.c

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=323371&r1=323370&r2=323371
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Tue Jun 14 11:38:43 2011
@@ -26753,7 +26753,7 @@
 		 * specified, use that address instead. */
 		/* XXX May need to revisit the final argument; does the realtime DB store whether
 		 * the original contact was over TLS or not? XXX */
-		if (!ast_test_flag(&peer->flags[0], SIP_NAT_RPORT_PRESENT) || ast_sockaddr_isnull(&peer->addr)) {
+		if (!ast_test_flag(&peer->flags[0], SIP_NAT_FORCE_RPORT) || ast_sockaddr_isnull(&peer->addr)) {
 			__set_address_from_contact(fullcontact->str, &peer->addr, 0);
 		}
 	}