[svn-commits] bbryant: branch 1.6.0 r124026 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Thu Jun 19 13:57:54 2008
New Revision: 124026

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

........
r124024 | bbryant | 2008-06-19 13:57:04 -0500 (Thu, 19 Jun 2008) | 2 lines

Fix bug in sip registration that sets the default port to 5060 for tls.

........

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=124026&r1=124025&r2=124026
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Thu Jun 19 13:57:54 2008
@@ -6056,6 +6056,9 @@
 			ast_log(LOG_WARNING, "%s is not a valid port number at line %d\n", porta, lineno);
 			return -1;
 		}
+	} else {
+		portnum = (transport == SIP_TRANSPORT_TLS) ?
+			STANDARD_TLS_PORT : STANDARD_SIP_PORT;
 	}
 	if (!(reg = ast_calloc(1, sizeof(*reg)))) {
 		ast_log(LOG_ERROR, "Out of memory. Can't allocate SIP registry entry\n");