mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
7541d30c9c
f52bb5b fix previous commit
18eac67 Fix entries in /etc/hosts disabling static leases.
f8c77ed Fix removal of DHCP_CLIENT_MAC options from DHCPv6 relay replies.
4bf62f6 Tidy cache_blockdata_free()
9c0d445 Fix e7bfd556c079c8b5e7425aed44abc35925b24043 to actually work.
2896e24 Check for not(DS or DNSKEY) in is_outdated_cname_pointer()
a90f09d Fix crash freeing negative SRV cache entries.
5b99eae Cache SRV records.
2daca52 Fix typo in ra-param man page section.
2c59473 File logic bug in cache-marshalling code. Introduced a couple of commits back.
cc921df Remove nested struct/union in cache records and all_addr.
ab194ed Futher address union tidying.
65a01b7 Tidy address-union handling: move class into explicit argument.
bde4647 Tidy all_addr union, merge log and rcode fields.
e7bfd55 Alter DHCP address selection after DECLINE in consec-addr mode. Avoid offering the same address after a recieving a DECLINE message to stop an infinite protocol loop. This has long been done in default address allocation mode: this adds similar behaviour when allocaing addresses consecutively.
The most relevant fix for openwrt is 18eac67 (& my own local f52bb5b
which fixes a missing bracket silly) To quote the patch:
It is possible for a config entry to have one address family specified by a
dhcp-host directive and the other added from /etc/hosts. This is especially
common on OpenWrt because it uses odhcpd for DHCPv6 and IPv6 leases are
imported into dnsmasq via a hosts file.
To handle this case there need to be separate *_HOSTS flags for IPv4 and IPv6.
Otherwise when the hosts file is reloaded it will clear the CONFIG_ADDR(6) flag
which was set by the dhcp-host directive.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
81 lines
2.5 KiB
Diff
81 lines
2.5 KiB
Diff
From bde46476ee06c96e821653dfdb8fa11fe7326998 Mon Sep 17 00:00:00 2001
|
|
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
Date: Mon, 31 Dec 2018 23:28:24 +0000
|
|
Subject: [PATCH 18/30] Tidy all_addr union, merge log and rcode fields.
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/cache.c | 2 +-
|
|
src/dnsmasq.h | 6 +-----
|
|
src/forward.c | 2 +-
|
|
src/rfc1035.c | 6 +++---
|
|
4 files changed, 6 insertions(+), 10 deletions(-)
|
|
|
|
--- a/src/cache.c
|
|
+++ b/src/cache.c
|
|
@@ -1926,7 +1926,7 @@ void log_query(unsigned int flags, char
|
|
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";
|
|
--- a/src/dnsmasq.h
|
|
+++ b/src/dnsmasq.h
|
|
@@ -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;
|
|
--- a/src/forward.c
|
|
+++ b/src/forward.c
|
|
@@ -658,7 +658,7 @@ static size_t process_reply(struct dns_h
|
|
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);
|
|
--- a/src/rfc1035.c
|
|
+++ b/src/rfc1035.c
|
|
@@ -950,7 +950,7 @@ size_t setup_reply(struct dns_header *he
|
|
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 *he
|
|
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
|
|
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;
|