diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-09 17:28:52 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-09 17:28:52 +0000 |
commit | db9568a1ac0828089b3b8bef29c39d6a187936bb (patch) | |
tree | ae9b5cc28838af5783e55d7d6bba183da2d08748 /channels | |
parent | 069393ece988d36fa51af2217181c8e4e31a8abe (diff) |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@174328 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5e0af097c..a8264bb30 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4193,7 +4193,7 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer) } } 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); |