diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-21 23:09:27 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-21 23:09:27 +0000 |
| commit | 5bdbf2e7e8150bfe7d0be6fffdea25d9951e102f (patch) | |
| tree | fe6bd7d14e5b98907de96c5ef8919f16bced324b /channels | |
| parent | f82520b9da918bdf6499aca9d5a715a0654b96c0 (diff) | |
Merged revisions 151420 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r151420 | mmichelson | 2008-10-21 18:08:56 -0500 (Tue, 21 Oct 2008) | 10 lines
When attempting to resolve hostnames, we need to be sure
to remove any parameters from the string so that name
resolution succeeds.
(closes issue #13727)
Reported by: fnordian
Patches:
resolvewithouturiparameter.patch uploaded by fnordian (license 110)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@151421 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2886758c5..46b390301 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -21238,9 +21238,17 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str if (srvlookup && peer->dnsmgr == NULL) { char transport[MAXHOSTNAMELEN]; + char _srvlookup[MAXHOSTNAMELEN]; + char *params; + + ast_copy_string(_srvlookup, srvlookup, sizeof(_srvlookup)); + if (params = strchr(_srvlookup, ';')) { + *params++ = '\0'; + } + snprintf(transport, sizeof(transport), "_sip._%s", get_transport(peer->socket.type)); - if (ast_dnsmgr_lookup(srvlookup, &peer->addr, &peer->dnsmgr, global_srvlookup ? transport : NULL)) { + if (ast_dnsmgr_lookup(_srvlookup, &peer->addr, &peer->dnsmgr, global_srvlookup ? transport : NULL)) { unref_peer(peer, "getting rid of a peer pointer"); return NULL; } |