From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7979 invoked by alias); 21 Jun 2011 15:23:59 -0000 Received: (qmail 7963 invoked by uid 22791); 21 Jun 2011 15:23:59 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_CP,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 21 Jun 2011 15:23:44 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5LFNiCb026637 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 21 Jun 2011 11:23:44 -0400 Received: from hase (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5LFNfHt028490 for ; Tue, 21 Jun 2011 11:23:43 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Filter results from gethostbyname4_r according to request flags References: X-Yow: .. the MYSTERIANS are in here with my CORDUROY SOAP DISH!! Date: Tue, 21 Jun 2011 15:23:00 -0000 In-Reply-To: (Andreas Schwab's message of "Thu, 16 Jun 2011 16:21:26 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-06/txt/msg00003.txt.bz2 2011-06-21 Andreas Schwab [BZ #12885] * sysdeps/posix/getaddrinfo.c (gaih_inet): Filter results from gethostbyname4_r according to request flags. --- sysdeps/posix/getaddrinfo.c | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 469abe2..7acc73d 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -881,16 +881,48 @@ gaih_inet (const char *name, const struct gaih_service *service, } } - no_inet6_data = no_data; - if (status == NSS_STATUS_SUCCESS) { if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL) canon = (*pat)->name; while (*pat != NULL) - pat = &((*pat)->next); + { + if ((*pat)->family == AF_INET + && req->ai_family == AF_INET6 + && (req->ai_flags & AI_V4MAPPED) != 0) + { + uint32_t *pataddr = (*pat)->addr; + (*pat)->family = AF_INET6; + pataddr[3] = pataddr[0]; + pataddr[2] = htonl (0xffff); + pataddr[1] = 0; + pataddr[0] = 0; + pat = &(*pat)->next; + } + else if ((req->ai_family == AF_UNSPEC + || (*pat)->family == req->ai_family)) + { + if ((*pat)->family == AF_INET6) + got_ipv6 = true; + pat = &(*pat)->next; + } + else if (*pat == at) + { + if ((*pat)->next != NULL) + memcpy (*pat, (*pat)->next, sizeof (**pat)); + else + { + no_data = 1; + break; + } + } + else + *pat = (*pat)->next; + } } + + no_inet6_data = no_data; } else { -- 1.7.5.4 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."