diff --git a/src/dnsmasq.h b/src/dnsmasq.h index 9828819..1286807 100644 --- a/src/dnsmasq.h +++ b/src/dnsmasq.h @@ -1518,7 +1518,5 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l unsigned short udp_sz, int optno, unsigned char *opt, size_t optlen, int set_do); size_t add_mac(struct dns_header *header, size_t plen, char *limit, union mysockaddr *l3); size_t add_source_addr(struct dns_header *header, size_t plen, char *limit, union mysockaddr *source); -#ifdef HAVE_DNSSEC size_t add_do_bit(struct dns_header *header, size_t plen, char *limit); -#endif int check_source(struct dns_header *header, size_t plen, unsigned char *pseudoheader, union mysockaddr *peer); diff --git a/src/edns0.c b/src/edns0.c index e137992..f82ba1b 100644 --- a/src/edns0.c +++ b/src/edns0.c @@ -208,6 +208,11 @@ size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned char *l return p - (unsigned char *)header; } +size_t add_do_bit(struct dns_header *header, size_t plen, char *limit) +{ + return add_pseudoheader(header, plen, (unsigned char *)limit, PACKETSZ, 0, NULL, 0, 1); +} + static int filter_mac(int family, char *addrp, char *mac, size_t maclen, void *parmv) { struct macparm *parm = parmv; @@ -329,13 +334,6 @@ size_t add_source_addr(struct dns_header *header, size_t plen, char *limit, unio return add_pseudoheader(header, plen, (unsigned char *)limit, PACKETSZ, EDNS0_OPTION_CLIENT_SUBNET, (unsigned char *)&opt, len, 0); } -#ifdef HAVE_DNSSEC -size_t add_do_bit(struct dns_header *header, size_t plen, char *limit) -{ - return add_pseudoheader(header, plen, (unsigned char *)limit, PACKETSZ, 0, NULL, 0, 1); -} -#endif - int check_source(struct dns_header *header, size_t plen, unsigned char *pseudoheader, union mysockaddr *peer) { /* Section 9.2, Check that subnet option in reply matches. */