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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@137814 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

@@ -4158,8 +4158,10 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer)
 	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) {