From: Andreas Schwab <schwab@redhat.com>
To: libc-hacker@sourceware.org
Subject: [PATCH] Filter results from gethostbyname4_r according to request flags
Date: Tue, 21 Jun 2011 15:23:00 -0000 [thread overview]
Message-ID: <m3k4cfgqda.fsf@redhat.com> (raw)
In-Reply-To: <m3fwn9j1qx.fsf@redhat.com> (Andreas Schwab's message of "Thu, 16 Jun 2011 16:21:26 +0200")
2011-06-21 Andreas Schwab <schwab@redhat.com>
[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."
next prev parent reply other threads:[~2011-06-21 15:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-16 14:21 Andreas Schwab
2011-06-21 15:23 ` Andreas Schwab [this message]
2011-06-21 21:06 ` Ulrich Drepper
2011-06-22 12:58 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3k4cfgqda.fsf@redhat.com \
--to=schwab@redhat.com \
--cc=libc-hacker@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).