From: Anton Lavrentiev <lavr@ncbi.nlm.nih.gov>
To: cygwin-patches@cygwin.com
Subject: [PATCH 5/5] Cygwin: resolver: Added processing of AAAA records
Date: Mon, 17 Jan 2022 13:03:14 -0500 [thread overview]
Message-ID: <20220117180314.29064-6-lavr@ncbi.nlm.nih.gov> (raw)
In-Reply-To: <20220117180314.29064-1-lavr@ncbi.nlm.nih.gov>
AAAA records returned from Windows resolver were flagged as "No structure" in
debug output because of being processed (although correctly) in the default
catch-all case. This patch makes the AAAA records properly recognized.
---
winsup/cygwin/libc/minires-os-if.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/winsup/cygwin/libc/minires-os-if.c b/winsup/cygwin/libc/minires-os-if.c
index 6b4c5e33e..bb6786f6c 100644
--- a/winsup/cygwin/libc/minires-os-if.c
+++ b/winsup/cygwin/libc/minires-os-if.c
@@ -69,15 +69,14 @@ static unsigned char * write_record(unsigned char * ptr, PDNS_RECORD rr,
switch(rr->wType) {
case DNS_TYPE_A:
+ case DNS_TYPE_AAAA:
{
- u_int8_t * aptr = (u_int8_t *) & rr->Data.A.IpAddress;
- if (ptr + 4 <= EndPtr) {
- ptr[0] = aptr[0];
- ptr[1] = aptr[1];
- ptr[2] = aptr[2];
- ptr[3] = aptr[3];
- }
- ptr += 4;
+ u_int8_t * aptr = rr->wType == DNS_TYPE_A
+ ? (u_int8_t *) & rr->Data.A.IpAddress : (u_int8_t *) & rr->Data.AAAA.Ip6Address;
+ int sz = rr->wType == DNS_TYPE_A ? NS_INADDRSZ/*4*/ : NS_IN6ADDRSZ/*16*/;
+ if (ptr + sz <= EndPtr)
+ memcpy(ptr, aptr, sz);
+ ptr += sz;
break;
}
case DNS_TYPE_NS:
--
2.33.0
prev parent reply other threads:[~2022-01-17 18:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-17 18:03 Anton Lavrentiev
2022-01-17 18:03 ` [PATCH 1/5] Cygwin: resolver: Debug to output both IP and port # in native b.o Anton Lavrentiev
2022-01-17 18:03 ` [PATCH 2/5] Cygwin: resolver: Process options forward (not backwards) Anton Lavrentiev
2022-01-18 10:32 ` Corinna Vinschen
2022-01-18 13:58 ` [EXTERNAL] " Lavrentiev, Anton (NIH/NLM/NCBI) [C]
2022-01-18 15:22 ` Corinna Vinschen
2022-01-17 18:03 ` [PATCH 3/5] Cygwin: resolver: Format spec consitency for Windows errors Anton Lavrentiev
2022-01-17 18:03 ` [PATCH 4/5] Cygwin: resolver: A little more consitency in debug messages Anton Lavrentiev
2022-01-17 18:03 ` Anton Lavrentiev [this message]
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=20220117180314.29064-6-lavr@ncbi.nlm.nih.gov \
--to=lavr@ncbi.nlm.nih.gov \
--cc=cygwin-patches@cygwin.com \
/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).