From 6de099e16cc8f960dec67086223fac0fa7c43d32 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Mon, 13 Jul 2009 23:33:18 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@206282 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index b8e3173d4d..c67b8fd454 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 */