[asterisk-commits] mmichelson: branch 1.6.1 r140420 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Aug 29 10:33:49 2008
New Revision: 140420

URL: http://svn.digium.com/view/asterisk?view=rev&rev=140420
Log:
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


........

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

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

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=140420&r1=140419&r2=140420
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Aug 29 10:33:49 2008
@@ -4325,6 +4325,11 @@
 		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;
 	}