diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-13 23:33:18 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-13 23:33:18 +0000 |
| commit | 4b2384fa9523f6a9f4d20a5e60eddf68233fdc78 (patch) | |
| tree | a9c9910e36e8f8497f843d7e79d0c359a280fa85 /channels | |
| parent | 0281ddd98ed3fe92108f8c6eab56b507f65cfa8c (diff) | |
Merged revisions 206280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r206280 | dvossel | 2009-07-13 18:26:51 -0500 (Mon, 13 Jul 2009) | 9 lines
dns lookup of peername rather than peer's host in transmit_register()
(closes issue #15052)
Reported by: fsantulli
Patches:
chan_sip_bug_15052_[20090626204511].patch uploaded by fsantulli (license 818)
Tested by: fsantulli
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@206282 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b8e3173d4..c67b8fd45 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10320,6 +10320,7 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char * char tmp[80]; char addr[80]; struct sip_pvt *p; + struct sip_peer *peer; int res; char *fromdomain; @@ -10333,8 +10334,12 @@ static int transmit_register(struct sip_registry *r, int sipmethod, const char * if (r->dnsmgr == NULL) { char transport[MAXHOSTNAMELEN]; + peer = find_peer(r->hostname, NULL, TRUE, FINDPEERS, FALSE); snprintf(transport, sizeof(transport), "_sip._%s", get_transport(r->transport)); /* have to use static get_transport function */ - ast_dnsmgr_lookup(r->hostname, &r->us, &r->dnsmgr, global_srvlookup ? transport : NULL); + ast_dnsmgr_lookup(peer ? peer->tohost : r->hostname, &r->us, &r->dnsmgr, global_srvlookup ? transport : NULL); + if (peer) { + unref_peer(peer, "removing peer ref for dnsmgr_lookup"); + } } if (r->call) { /* We have a registration */ |