Merged revisions 140418 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r140418 | mmichelson | 2008-08-29 10:32:02 -0500 (Fri, 29 Aug 2008) | 18 lines

Merged revisions 140417 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140417 | mmichelson | 2008-08-29 10:26:52 -0500 (Fri, 29 Aug 2008) | 10 lines

Fix SIP's parsing so that if a port is specified
in a string to Dial(), it is not ignored.

(closes issue #13355)
Reported by: acunningham
Patches:
      13355v2.patch uploaded by putnopvut (license 60)
Tested by: acunningham


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140420 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-08-29 15:33:49 +00:00
parent 9a53ace006
commit 41b37a348f

View File

@@ -4325,6 +4325,11 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer, struct sockadd
if (newdialog)
dialog->socket.type = 0;
res = create_addr_from_peer(dialog, peer);
if (!ast_strlen_zero(port)) {
if ((portno = atoi(port))) {
dialog->sa.sin_port = dialog->recv.sin_port = htons(portno);
}
}
unref_peer(peer, "create_addr: unref peer from find_peer hashtab lookup");
return res;
}