Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly sanitise DNS header bits in answer when recreating query for retry.

Browse Source
This commit is contained in:
swigger
2015-06-01 20:54:59 +01:00
committed by Simon Kelley
parent 403de05925
commit bd7bfa21c4
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dns-protocol.h
View File

@@ -84,15 +84,15 @@ struct dns_header {
u16 qdcount,ancount,nscount,arcount; u16 qdcount,ancount,nscount,arcount;
}; };
#define HB3_QR 0x80 #define HB3_QR 0x80 /* Query */
#define HB3_OPCODE 0x78 #define HB3_OPCODE 0x78
#define HB3_AA 0x04 #define HB3_AA 0x04 /* Authoritative Answer */
#define HB3_TC 0x02 #define HB3_TC 0x02 /* TrunCated */
#define HB3_RD 0x01 #define HB3_RD 0x01 /* Recursion Desired */
#define HB4_RA 0x80 #define HB4_RA 0x80 /* Recursion Available */
#define HB4_AD 0x20 #define HB4_AD 0x20 /* Authenticated Data */
#define HB4_CD 0x10 #define HB4_CD 0x10 /* Checking Disabled */
#define HB4_RCODE 0x0f #define HB4_RCODE 0x0f
#define OPCODE(x) (((x)->hb3 & HB3_OPCODE) >> 3) #define OPCODE(x) (((x)->hb3 & HB3_OPCODE) >> 3)

3
src/forward.c
View File

@@ -769,7 +769,8 @@ void reply_query(int fd, int family, time_t now)
header->arcount = htons(0); header->arcount = htons(0);
if ((nn = resize_packet(header, (size_t)n, pheader, plen))) if ((nn = resize_packet(header, (size_t)n, pheader, plen)))
{ {
header->hb3 &= ~(HB3_QR | HB3_TC); header->hb3 &= ~(HB3_QR | HB3_AA | HB3_TC);
header->hb4 &= ~(HB4_RA | HB4_RCODE);
forward_query(-1, NULL, NULL, 0, header, nn, now, forward, 0, 0); forward_query(-1, NULL, NULL, 0, header, nn, now, forward, 0, 0);
return; return;
} }