OpenWrt – Blame information for rev 1
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 1 | From bde46476ee06c96e821653dfdb8fa11fe7326998 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Kelley <simon@thekelleys.org.uk> |
||
3 | Date: Mon, 31 Dec 2018 23:28:24 +0000 |
||
4 | Subject: [PATCH 18/32] Tidy all_addr union, merge log and rcode fields. |
||
5 | |||
6 | Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> |
||
7 | --- |
||
8 | src/cache.c | 2 +- |
||
9 | src/dnsmasq.h | 6 +----- |
||
10 | src/forward.c | 2 +- |
||
11 | src/rfc1035.c | 6 +++--- |
||
12 | 4 files changed, 6 insertions(+), 10 deletions(-) |
||
13 | |||
14 | --- a/src/cache.c |
||
15 | +++ b/src/cache.c |
||
16 | @@ -1926,7 +1926,7 @@ void log_query(unsigned int flags, char |
||
17 | sprintf(daemon->addrbuff, arg, addr->addr.log.keytag, addr->addr.log.algo, addr->addr.log.digest); |
||
18 | else if (flags & F_RCODE) |
||
19 | { |
||
20 | - unsigned int rcode = addr->addr.rcode.rcode; |
||
21 | + unsigned int rcode = addr->addr.log.rcode; |
||
22 | |||
23 | if (rcode == SERVFAIL) |
||
24 | dest = "SERVFAIL"; |
||
25 | --- a/src/dnsmasq.h |
||
26 | +++ b/src/dnsmasq.h |
||
27 | @@ -279,12 +279,8 @@ struct all_addr { |
||
28 | struct in6_addr addr6; |
||
29 | /* for log_query */ |
||
30 | struct { |
||
31 | - unsigned short keytag, algo, digest; |
||
32 | + unsigned short keytag, algo, digest, rcode; |
||
33 | } log; |
||
34 | - /* for log_query */ |
||
35 | - struct { |
||
36 | - unsigned int rcode; |
||
37 | - } rcode; |
||
38 | /* for cache_insert of DNSKEY, DS */ |
||
39 | struct { |
||
40 | unsigned short class, type; |
||
41 | --- a/src/forward.c |
||
42 | +++ b/src/forward.c |
||
43 | @@ -658,7 +658,7 @@ static size_t process_reply(struct dns_h |
||
44 | if (rcode != NOERROR && rcode != NXDOMAIN) |
||
45 | { |
||
46 | struct all_addr a; |
||
47 | - a.addr.rcode.rcode = rcode; |
||
48 | + a.addr.log.rcode = rcode; |
||
49 | log_query(F_UPSTREAM | F_RCODE, "error", &a, NULL); |
||
50 | |||
51 | return resize_packet(header, n, pheader, plen); |
||
52 | --- a/src/rfc1035.c |
||
53 | +++ b/src/rfc1035.c |
||
54 | @@ -950,7 +950,7 @@ size_t setup_reply(struct dns_header *he |
||
55 | else if (flags == F_SERVFAIL) |
||
56 | { |
||
57 | struct all_addr a; |
||
58 | - a.addr.rcode.rcode = SERVFAIL; |
||
59 | + a.addr.log.rcode = SERVFAIL; |
||
60 | log_query(F_CONFIG | F_RCODE, "error", &a, NULL); |
||
61 | SET_RCODE(header, SERVFAIL); |
||
62 | } |
||
63 | @@ -975,7 +975,7 @@ size_t setup_reply(struct dns_header *he |
||
64 | else /* nowhere to forward to */ |
||
65 | { |
||
66 | struct all_addr a; |
||
67 | - a.addr.rcode.rcode = REFUSED; |
||
68 | + a.addr.log.rcode = REFUSED; |
||
69 | log_query(F_CONFIG | F_RCODE, "error", &a, NULL); |
||
70 | SET_RCODE(header, REFUSED); |
||
71 | } |
||
72 | @@ -1374,7 +1374,7 @@ size_t answer_request(struct dns_header |
||
73 | notimp = 1, auth = 0; |
||
74 | if (!dryrun) |
||
75 | { |
||
76 | - addr.addr.rcode.rcode = NOTIMP; |
||
77 | + addr.addr.log.rcode = NOTIMP; |
||
78 | log_query(F_CONFIG | F_RCODE, name, &addr, NULL); |
||
79 | } |
||
80 | ans = 1, sec_data = 0; |