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.

........


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

channels/chan_sip.c

@@ -6056,6 +6056,9 @@ static int sip_register(const char *value, int lineno)
 			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");