[asterisk-commits] mmichelson: branch 1.6.0 r174328 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Feb  9 11:28:52 2009
New Revision: 174328

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

........
r174327 | mmichelson | 2009-02-09 11:27:32 -0600 (Mon, 09 Feb 2009) | 3 lines

Fix something I messed up in the merge I just did


........

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/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=174328&r1=174327&r2=174328
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Mon Feb  9 11:28:52 2009
@@ -4193,7 +4193,7 @@
 			}
 		}
 	 	if (!portno)
-	 		portno = port ? atoi(port) : STANDARD_SIP_PORT;
+			portno = port ? atoi(port) : (dialog->socket.type & SIP_TRANSPORT_TLS) ? STANDARD_TLS_PORT : STANDARD_SIP_PORT;
 		hp = ast_gethostbyname(hostn, &ahp);
 		if (!hp) {
 			ast_log(LOG_WARNING, "No such host: %s\n", peername);