aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorbbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-19 18:57:54 +0000
committerbbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-19 18:57:54 +0000
commit048b6984f0cc5c42cfa760f53256a2093d6beef2 (patch)
tree67abe45a6def6c833f9b3080fc25c1f094fdc928 /channels
parent984a40bb7db5f0f074a136fa072e60e25f768a8f (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@124026 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9fc86f8ae..ec4b42ce9 100644
--- a/channels/chan_sip.c
+++ b/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");