From a02ef73b251814e32dd5e16c9d29e2b2b8e83fc7 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Mon, 9 Feb 2009 17:20:55 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@174301 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a6d9c2c0a7..eea6d026f9 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4818,7 +4818,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; @@ -4873,8 +4873,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 (sip_cfg.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 && sip_cfg.srvlookup) { char service[MAXHOSTNAMELEN]; int tportno; @@ -4885,7 +4887,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);