[svn-commits] oej: branch 1.2 r46610 - in /branches/1.2: channels/ configs/

[svn-commits at lists.digium.com]

Author: oej
Date: Tue Oct 31 03:49:46 2006
New Revision: 46610

URL: http://svn.digium.com/view/asterisk?rev=46610&view=rev
Log:
Another try to fix ;rport NAT traversal support (issue #7473)

Modified:
    branches/1.2/channels/chan_sip.c
    branches/1.2/configs/sip.conf.sample

Modified: branches/1.2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_sip.c?rev=46610&r1=46609&r2=46610&view=diff
==============================================================================
--- branches/1.2/channels/chan_sip.c (original)
+++ branches/1.2/channels/chan_sip.c Tue Oct 31 03:49:46 2006
@@ -3936,7 +3936,7 @@
 				if (rport && *(rport+6) == '=') 
 					rport = NULL;		/* We already have a parameter to rport */
 
-				if (rport && (ast_test_flag(p, SIP_NAT) == SIP_NAT_ALWAYS)) {
+				if (rport && ((ast_test_flag(p, SIP_NAT) == SIP_NAT_ALWAYS) || (ast_test_flag(p, SIP_NAT) == SIP_NAT_RFC3581))) {
 					/* We need to add received port - rport */
 					ast_copy_string(tmp, oh, sizeof(tmp));
 

Modified: branches/1.2/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.2/configs/sip.conf.sample?rev=46610&r1=46609&r2=46610&view=diff
==============================================================================
--- branches/1.2/configs/sip.conf.sample (original)
+++ branches/1.2/configs/sip.conf.sample Tue Oct 31 03:49:46 2006
@@ -187,7 +187,7 @@
 ;
 ;nat=no				; Global NAT settings  (Affects all peers and users)
                                 ; yes = Always ignore info and assume NAT
-                                ; no = Use NAT mode only according to RFC3581 
+                                ; no = Use NAT mode only according to RFC3581 (;rport)
                                 ; never = Never attempt NAT mode or RFC3581 support
 				; route = Assume NAT, don't send rport 
 				; (work around more UNIDEN bugs)