[svn-commits] qwell: branch 1.6.0 r137814 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Aug 14 10:37:35 2008
New Revision: 137814

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

........
r137812 | qwell | 2008-08-14 10:32:16 -0500 (Thu, 14 Aug 2008) | 8 lines

Make sure we set the socket port, so we don't try to use <ip address>:0.

(closes issue #13255)
Reported by: falves11
Patches:
      13255-socketport.diff uploaded by qwell (license 4)
Tested by: falves11

........

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=137814&r1=137813&r2=137814
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Aug 14 10:37:35 2008
@@ -4158,8 +4158,10 @@
 	hostn = peername;
 	if (!dialog->socket.type)
 		dialog->socket.type = SIP_TRANSPORT_UDP;
+	if (!dialog->socket.port)
+		dialog->socket.port = bindaddr.sin_port;
 	if (ast_strlen_zero(port) || sscanf(port, "%u", &portno) != 1) {
-		portno = dialog->socket.type & SIP_TRANSPORT_TLS ? 
+		portno = (dialog->socket.type & SIP_TRANSPORT_TLS) ? 
 			STANDARD_TLS_PORT : STANDARD_SIP_PORT;
 	}
 	if (global_srvlookup) {