drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Anton Lavrentiev via Cygwin-patches 2022-01-18 17:39:15 -05:00 committed by Corinna Vinschen
parent 12bf36f72b
commit 905f51d797
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/libc/minires-os-if.c
View File

@ -189,10 +189,14 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty
DWORD section; DWORD section;
int len, counts[4] = {0, 0, 0, 0}, debug = statp->options & RES_DEBUG; int len, counts[4] = {0, 0, 0, 0}, debug = statp->options & RES_DEBUG;
unsigned char * dnptrs[256], * ptr; unsigned char * dnptrs[256], * ptr;
unsigned short Id = 0;
dnptrs[0] = AnsPtr; dnptrs[0] = AnsPtr;
dnptrs[1] = NULL; dnptrs[1] = NULL;
if (AnsLength >= 2)
memcpy(&Id, AnsPtr, 2);
memset(AnsPtr, 0, AnsLength); memset(AnsPtr, 0, AnsLength);
if (Class != ns_c_in) { if (Class != ns_c_in) {
@ -294,7 +298,7 @@ static int cygwin_query(res_state statp, const char * DomName, int Class, int Ty
done: done:
if (HFIXEDSZ <= AnsLength) { if (HFIXEDSZ <= AnsLength) {
ptr = AnsPtr; ptr = AnsPtr;
PUTSHORT(0, ptr); /* Id */ PUTSHORT(Id, ptr);
PUTSHORT((QR << 8) + RA + RD, ptr); PUTSHORT((QR << 8) + RA + RD, ptr);
for (section = 0; section < DIM(counts); section++) { for (section = 0; section < DIM(counts); section++) {
PUTSHORT(counts[section], ptr); PUTSHORT(counts[section], ptr);

7
winsup/cygwin/libc/minires.c
View File

@ -450,6 +450,8 @@ int res_nsend( res_state statp, const unsigned char * MsgPtr,
ptr += len; ptr += len;
GETSHORT(Type, ptr); GETSHORT(Type, ptr);
GETSHORT(Class, ptr); GETSHORT(Class, ptr);
if (AnsLength >= 2)
memcpy(AnsPtr, MsgPtr, 2);
return ((os_query_t *) statp->os_query)(statp, DomName, Class, Type, AnsPtr, AnsLength); return ((os_query_t *) statp->os_query)(statp, DomName, Class, Type, AnsPtr, AnsLength);
} }
else { else {
@ -709,8 +711,11 @@ int res_nquery( res_state statp, const char * DomName, int Class, int Type,
statp->res_h_errno = NETDB_SUCCESS; statp->res_h_errno = NETDB_SUCCESS;
/* If a hook exists to a native implementation, use it */ /* 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); return ((os_query_t *) statp->os_query)(statp, DomName, Class, Type, AnsPtr, AnsLength);
}
if ((len = res_nmkquery (statp, QUERY, DomName, Class, Type, if ((len = res_nmkquery (statp, QUERY, DomName, Class, Type,
0, 0, 0, packet, PACKETSZ)) < 0) 0, 0, 0, packet, PACKETSZ)) < 0)