diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-09 17:26:39 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-09 17:26:39 +0000 |
| commit | 7a55bb922e31ca4be50cebfbb5a19c299f5c32cd (patch) | |
| tree | 43387b5ec8ec80347d81c2b5ff0f298e38999371 /channels | |
| parent | 9fbe20af6c50cdd88fb90b3f47eca9fea4c6161a (diff) | |
Merged revisions 174301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r174301 | mmichelson | 2009-02-09 11:20:55 -0600 (Mon, 09 Feb 2009) | 20 lines
Merged revisions 174282 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r174282 | mmichelson | 2009-02-09 11:11:05 -0600 (Mon, 09 Feb 2009) | 12 lines
Don't do an SRV lookup if a port is specified
RFC 3263 says to do A record lookups on a hostname
if a port has been specified, so that's what we're
going to do. See section 4.2.
(closes issue #14419)
Reported by: klaus3000
Patches:
patch_chan_sip_nosrvifport_1.4.23.txt uploaded by klaus3000 (license 65)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@174326 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d3a904cfe..45cd56446 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4411,7 +4411,7 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer, struct sockadd struct ast_hostent ahp; struct sip_peer *peer; char *port; - int portno; + int portno = 0; char host[MAXHOSTNAMELEN], *hostn; char peername[256]; int srv_ret = 0; @@ -4466,8 +4466,10 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer, struct sockadd In the future, we should first check NAPTR to find out transport preference */ hostn = peername; - portno = port ? atoi(port) : (dialog->socket.type & SIP_TRANSPORT_TLS) ? STANDARD_TLS_PORT : STANDARD_SIP_PORT; - if (global_srvlookup) { + /* Section 4.2 of RFC 3263 specifies that if a port number is specified, then + * an A record lookup should be used instead of SRV. + */ + if (!port && global_srvlookup) { char service[MAXHOSTNAMELEN]; int tportno; @@ -4478,7 +4480,8 @@ static int create_addr(struct sip_pvt *dialog, const char *opeer, struct sockadd portno = tportno; } } - + if (!portno) + portno = port ? atoi(port) : STANDARD_SIP_PORT; hp = ast_gethostbyname(hostn, &ahp); if (!hp) { ast_log(LOG_WARNING, "No such host: %s\n", peername); |