From 49ffa786ffc30838ba84b33f45be4759c722f5d4 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 7 Jun 2007 23:59:04 +0000 Subject: [PATCH] Do a DNS lookup immediately upon calling the dnsmgr function, don't wait until a refresh happens. (issue #9097 reported by plack) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@68368 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- dnsmgr.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dnsmgr.c b/dnsmgr.c index 5838114905..75fcdd8300 100644 --- a/dnsmgr.c +++ b/dnsmgr.c @@ -112,6 +112,9 @@ void ast_dnsmgr_release(struct ast_dnsmgr_entry *entry) int ast_dnsmgr_lookup(const char *name, struct in_addr *result, struct ast_dnsmgr_entry **dnsmgr) { + struct ast_hostent ahp; + struct hostent *hp; + if (ast_strlen_zero(name) || !result || !dnsmgr) return -1; @@ -126,21 +129,18 @@ int ast_dnsmgr_lookup(const char *name, struct in_addr *result, struct ast_dnsmg if (inet_aton(name, result)) return 0; - /* if the manager is disabled, do a direct lookup and return the result, - otherwise register a managed lookup for the name */ - if (!enabled) { - struct ast_hostent ahp; - struct hostent *hp; + /* do a lookup now but add a manager so it will automagically get updated in the background */ + if ((hp = ast_gethostbyname(name, &ahp))) + memcpy(result, hp->h_addr, sizeof(result)); - if ((hp = ast_gethostbyname(name, &ahp))) - memcpy(result, hp->h_addr, sizeof(result)); + /* if dnsmgr is not enable don't bother adding an entry */ + if (!enabled) return 0; - } else { - if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_2 "adding manager for '%s'\n", name); - *dnsmgr = ast_dnsmgr_get(name, result); - return !*dnsmgr; - } + + if (option_verbose > 2) + ast_verbose(VERBOSE_PREFIX_2 "adding manager for '%s'\n", name); + *dnsmgr = ast_dnsmgr_get(name, result); + return !*dnsmgr; } static void *do_refresh(void *data) -- 2.47.2