[asterisk-commits] file: branch 1.6.0 r162621 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Dec 10 09:26:49 2008
New Revision: 162621

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162621
Log:
Merged revisions 162619 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r162619 | file | 2008-12-10 11:22:26 -0400 (Wed, 10 Dec 2008) | 4 lines
  
  When transmitting a register set the socket port to the local one for the transport being used, not the port for the remote server.
  (closes issue #13633)
  Reported by: performer
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=162621&r1=162620&r2=162621
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Dec 10 09:26:49 2008
@@ -9475,7 +9475,9 @@
 
 		/* Set transport and port so the correct contact is built */
 		p->socket.type = r->transport;
-		p->socket.port = htons(r->portno);
+		if (r->transport == SIP_TRANSPORT_TLS || r->transport == SIP_TRANSPORT_TCP) {
+			p->socket.port = sip_tcp_desc.sin.sin_port;
+		}
 		/*
 		  check which address we should use in our contact header 
 		  based on whether the remote host is on the external or