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

Tidy all_addr union, merge log and rcode fields.

Browse Source
This commit is contained in:
Simon Kelley
2018-12-31 23:28:24 +00:00
parent e7bfd556c0
commit bde46476ee
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cache.c
View File

@@ -1926,7 +1926,7 @@ void log_query(unsigned int flags, char *name, struct all_addr *addr, char *arg)
sprintf(daemon->addrbuff, arg, addr->addr.log.keytag, addr->addr.log.algo, addr->addr.log.digest);
else if (flags & F_RCODE)
{
unsigned int rcode = addr->addr.rcode.rcode;
unsigned int rcode = addr->addr.log.rcode;
if (rcode == SERVFAIL)
dest = "SERVFAIL";

6
src/dnsmasq.h
View File

@@ -279,12 +279,8 @@ struct all_addr {
struct in6_addr addr6;
/* for log_query */
struct {
unsigned short keytag, algo, digest;
unsigned short keytag, algo, digest, rcode;
} log;
/* for log_query */
struct {
unsigned int rcode;
} rcode;
/* for cache_insert of DNSKEY, DS */
struct {
unsigned short class, type;

2
src/forward.c
View File

@@ -658,7 +658,7 @@ static size_t process_reply(struct dns_header *header, time_t now, struct server
if (rcode != NOERROR && rcode != NXDOMAIN)
{
struct all_addr a;
a.addr.rcode.rcode = rcode;
a.addr.log.rcode = rcode;
log_query(F_UPSTREAM | F_RCODE, "error", &a, NULL);
return resize_packet(header, n, pheader, plen);

6
src/rfc1035.c
View File

@@ -950,7 +950,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
else if (flags == F_SERVFAIL)
{
struct all_addr a;
a.addr.rcode.rcode = SERVFAIL;
a.addr.log.rcode = SERVFAIL;
log_query(F_CONFIG | F_RCODE, "error", &a, NULL);
SET_RCODE(header, SERVFAIL);
}
@@ -975,7 +975,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
else /* nowhere to forward to */
{
struct all_addr a;
a.addr.rcode.rcode = REFUSED;
a.addr.log.rcode = REFUSED;
log_query(F_CONFIG | F_RCODE, "error", &a, NULL);
SET_RCODE(header, REFUSED);
}
@@ -1374,7 +1374,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
notimp = 1, auth = 0;
if (!dryrun)
{
addr.addr.rcode.rcode = NOTIMP;
addr.addr.log.rcode = NOTIMP;
log_query(F_CONFIG | F_RCODE, name, &addr, NULL);
}
ans = 1, sec_data = 0;