[svn-commits] file: branch file/issue8855 r194429 - /team/file/issue8855/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu May 14 09:47:07 2009
New Revision: 194429

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=194429
Log:
Fix the option to force rport so it actually forces it.

Modified:
    team/file/issue8855/channels/chan_sip.c

Modified: team/file/issue8855/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/file/issue8855/channels/chan_sip.c?view=diff&rev=194429&r1=194428&r2=194429
==============================================================================
--- team/file/issue8855/channels/chan_sip.c (original)
+++ team/file/issue8855/channels/chan_sip.c Thu May 14 09:47:07 2009
@@ -8412,8 +8412,7 @@
 			if (rport && *(rport+6) == '=') 
 				rport = NULL;		/* We already have a parameter to rport */
 
-			/* Check rport if NAT=yes or NAT=rfc3581 (which is the default setting)  */
-			if (rport && ((ast_test_flag(&p->flags[0], SIP_NAT_FORCE_RPORT)) || (ast_test_flag(&p->flags[0], SIP_NAT_RPORT_PRESENT)))) {
+			if (((ast_test_flag(&p->flags[0], SIP_NAT_FORCE_RPORT)) || (rport && ast_test_flag(&p->flags[0], SIP_NAT_RPORT_PRESENT)))) {
 				/* We need to add received port - rport */
 				char *end;