public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: resolver: Fix to match response ID with request ID Date: Wed, 19 Jan 2022 07:55:42 +0000 (GMT) [thread overview] Message-ID: <20220119075542.F3BE03857817@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=905f51d7978e09b8f21d7442c58751fdf775c637 commit 905f51d7978e09b8f21d7442c58751fdf775c637 Author: Anton Lavrentiev via Cygwin-patches <cygwin-patches@cygwin.com> Date: Tue Jan 18 17:39:15 2022 -0500 Cygwin: resolver: Fix to match response ID with request ID In case when the native OS resolver is used (via os_query) the returned response ID is always 0. It should actually match the ID passed in to res_send() in the DNS request header. This patch fixes that Diff: --- winsup/cygwin/libc/minires-os-if.c | 6 +++++- winsup/cygwin/libc/minires.c | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/libc/minires-os-if.c b/winsup/cygwin/libc/minires-os-if.c index c4183db9c..8d3178f70 100644 --- a/winsup/cygwin/libc/minires-os-if.c +++ b/winsup/cygwin/libc/minires-os-if.c @@ -189,10 +189,14 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty DWORD section; int len, counts[4] = {0, 0, 0, 0}, debug = statp->options & RES_DEBUG; unsigned char * dnptrs[256], * ptr; + unsigned short Id = 0; dnptrs[0] = AnsPtr; dnptrs[1] = NULL; + if (AnsLength >= 2) + memcpy(&Id, AnsPtr, 2); + memset(AnsPtr, 0, AnsLength); if (Class != ns_c_in) { @@ -294,7 +298,7 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty done: if (HFIXEDSZ <= AnsLength) { ptr = AnsPtr; - PUTSHORT(0, ptr); /* Id */ + PUTSHORT(Id, ptr); PUTSHORT((QR << 8) + RA + RD, ptr); for (section = 0; section < DIM(counts); section++) { PUTSHORT(counts[section], ptr); diff --git a/winsup/cygwin/libc/minires.c b/winsup/cygwin/libc/minires.c index fdc6087f5..b540f6a1b 100644 --- a/winsup/cygwin/libc/minires.c +++ b/winsup/cygwin/libc/minires.c @@ -450,6 +450,8 @@ int res_nsend( res_state statp, const unsigned char * MsgPtr, ptr += len; GETSHORT(Type, ptr); GETSHORT(Class, ptr); + if (AnsLength >= 2) + memcpy(AnsPtr, MsgPtr, 2); return ((os_query_t *) statp->os_query)(statp, DomName, Class, Type, AnsPtr, AnsLength); } else { @@ -709,8 +711,11 @@ int res_nquery( res_state statp, const char * DomName, int Class, int Type, statp->res_h_errno = NETDB_SUCCESS; /* If a hook exists to a native implementation, use it */ - if (statp->os_query) + if (statp->os_query) { + if (AnsLength >= 2) + memset(AnsPtr, 0/*Id*/, 2); return ((os_query_t *) statp->os_query)(statp, DomName, Class, Type, AnsPtr, AnsLength); + } if ((len = res_nmkquery (statp, QUERY, DomName, Class, Type, 0, 0, 0, packet, PACKETSZ)) < 0)
reply other threads:[~2022-01-19 7:55 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220119075542.F3BE03857817@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@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: linkBe 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).