From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 086D53947C31; Wed, 23 Feb 2022 09:02:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 086D53947C31 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc/siddhesh/gai-cleanup2] gaih_inet: Split simple gethostbyname into its own function X-Act-Checkin: glibc X-Git-Author: Siddhesh Poyarekar X-Git-Refname: refs/heads/siddhesh/gai-cleanup2 X-Git-Oldrev: 1d4ef95b3440c17ad51f1e7b49c5588587182557 X-Git-Newrev: 0d59a161ee5492f02c6b337b85a325dd1f739658 Message-Id: <20220223090251.086D53947C31@sourceware.org> Date: Wed, 23 Feb 2022 09:02:51 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2022 09:02:51 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0d59a161ee5492f02c6b337b85a325dd1f739658 commit 0d59a161ee5492f02c6b337b85a325dd1f739658 Author: Siddhesh Poyarekar Date: Wed Feb 16 23:58:17 2022 +0530 gaih_inet: Split simple gethostbyname into its own function Make the simple gethostbyname2_r call into its own function which dynamically allocates AT. Track AT through ADDRMEM to free later. Signed-off-by: Siddhesh Poyarekar Diff: --- sysdeps/posix/getaddrinfo.c | 137 ++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 63 deletions(-) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 0d7c10a5c8..876e590c48 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -515,6 +515,66 @@ get_numeric_res (const char *name, const struct addrinfo *req, int *retp) return NULL; } +/* Call the simple, old functions, which do not support IPv6 scope ids, nor + retrieving the canonical name. Return address tuples on success and error + code in RETP on failure. */ + +static struct gaih_addrtuple * +simple_gethostbyname (const char *name, const struct addrinfo *req, + struct scratch_buffer *tmpbuf, int *retp) +{ + int rc; + struct hostent th; + struct hostent *h; + struct gaih_addrtuple *at = NULL; + + while (1) + { + rc = __gethostbyname2_r (name, AF_INET, &th, + tmpbuf->data, tmpbuf->length, + &h, &h_errno); + if (rc != ERANGE || h_errno != NETDB_INTERNAL) + break; + if (!scratch_buffer_grow (tmpbuf)) + { + *retp = -EAI_MEMORY; + return NULL; + } + } + + if (rc == 0) + { + if (h != NULL) + { + /* We found data, convert it. */ + if (!convert_hostent_to_gaih_addrtuple (req, AF_INET, h, &at)) + *retp = -EAI_MEMORY; + else + *retp = 0; + } + else + { + if (h_errno == NO_DATA) + *retp = -EAI_NODATA; + else + *retp = -EAI_NONAME; + } + } + else + { + if (h_errno == NETDB_INTERNAL) + *retp = -EAI_SYSTEM; + else if (h_errno == TRY_AGAIN) + *retp = -EAI_AGAIN; + else + /* We made requests but they turned out no data. + The name is known, though. */ + *retp = -EAI_NODATA; + } + + return at; +} + static int gaih_inet (const char *name, const struct gaih_service *service, const struct addrinfo *req, struct addrinfo **pai, @@ -562,6 +622,20 @@ gaih_inet (const char *name, const struct gaih_service *service, else if (result != 0) goto free_and_return; + /* If we do not have to look for IPv6 addresses or the canonical + name, use the simple, old functions, which do not support + IPv6 scope ids, nor retrieving the canonical name. */ + if (req->ai_family == AF_INET && (req->ai_flags & AI_CANONNAME) == 0) + { + if ((at = simple_gethostbyname (name, req, tmpbuf, &result)) != NULL) + { + addrmem = at; + goto process_list; + } + else if (result != 0) + goto free_and_return; + } + struct gaih_addrtuple **pat = &at; int no_data = 0; int no_inet6_data = 0; @@ -571,69 +645,6 @@ gaih_inet (const char *name, const struct gaih_service *service, int no_more; struct resolv_context *res_ctx = NULL; - /* If we do not have to look for IPv6 addresses or the canonical - name, use the simple, old functions, which do not support - IPv6 scope ids, nor retrieving the canonical name. */ - if (req->ai_family == AF_INET - && (req->ai_flags & AI_CANONNAME) == 0) - { - int rc; - struct hostent th; - struct hostent *h; - - while (1) - { - rc = __gethostbyname2_r (name, AF_INET, &th, - tmpbuf->data, tmpbuf->length, - &h, &h_errno); - if (rc != ERANGE || h_errno != NETDB_INTERNAL) - break; - if (!scratch_buffer_grow (tmpbuf)) - { - result = -EAI_MEMORY; - goto free_and_return; - } - } - - if (rc == 0) - { - if (h != NULL) - { - /* We found data, convert it. */ - if (!convert_hostent_to_gaih_addrtuple - (req, AF_INET, h, &addrmem)) - { - result = -EAI_MEMORY; - goto free_and_return; - } - *pat = addrmem; - } - else - { - if (h_errno == NO_DATA) - result = -EAI_NODATA; - else - result = -EAI_NONAME; - goto free_and_return; - } - } - else - { - if (h_errno == NETDB_INTERNAL) - result = -EAI_SYSTEM; - else if (h_errno == TRY_AGAIN) - result = -EAI_AGAIN; - else - /* We made requests but they turned out no data. - The name is known, though. */ - result = -EAI_NODATA; - - goto free_and_return; - } - - goto process_list; - } - #ifdef USE_NSCD if (__nss_not_use_nscd_hosts > 0 && ++__nss_not_use_nscd_hosts > NSS_NSCD_RETRY)