mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +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>
64 lines
1.8 KiB
Diff
64 lines
1.8 KiB
Diff
From cbb5b17ad8e03e08ade62376a4f6a2066e55960d Mon Sep 17 00:00:00 2001
|
|
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
Date: Tue, 23 Oct 2018 23:45:57 +0100
|
|
Subject: [PATCH 05/30] Fix logging in cf5984367bc6a949e3803a576512c5a7bc48ebab
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/rfc1035.c | 27 ++++++++++++++++++---------
|
|
1 file changed, 18 insertions(+), 9 deletions(-)
|
|
|
|
--- a/src/rfc1035.c
|
|
+++ b/src/rfc1035.c
|
|
@@ -1335,7 +1335,6 @@ size_t answer_request(struct dns_header
|
|
{
|
|
unsigned long ttl = daemon->local_ttl;
|
|
int ok = 1;
|
|
- log_query(F_CONFIG | F_RRNAME, name, NULL, "<TXT>");
|
|
#ifndef NO_ID
|
|
/* Dynamically generate stat record */
|
|
if (t->stat != 0)
|
|
@@ -1345,11 +1344,14 @@ size_t answer_request(struct dns_header
|
|
ok = 0;
|
|
}
|
|
#endif
|
|
- if (ok && add_resource_record(header, limit, &trunc, nameoffset, &ansp,
|
|
- ttl, NULL,
|
|
- T_TXT, t->class, "t", t->len, t->txt))
|
|
- anscount++;
|
|
-
|
|
+ if (ok)
|
|
+ {
|
|
+ log_query(F_CONFIG | F_RRNAME, name, NULL, "<TXT>");
|
|
+ if (add_resource_record(header, limit, &trunc, nameoffset, &ansp,
|
|
+ ttl, NULL,
|
|
+ T_TXT, t->class, "t", t->len, t->txt))
|
|
+ anscount++;
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
@@ -1357,12 +1359,19 @@ size_t answer_request(struct dns_header
|
|
|
|
if (qclass == C_CHAOS)
|
|
{
|
|
- /* don't forward *.bind and *.server chaos queries */
|
|
+ /* don't forward *.bind and *.server chaos queries - always reply with NOTIMP */
|
|
if (hostname_issubdomain("bind", name) || hostname_issubdomain("server", name))
|
|
{
|
|
if (!ans)
|
|
- notimp = 1, auth = 0;
|
|
- ans = 1;
|
|
+ {
|
|
+ notimp = 1, auth = 0;
|
|
+ if (!dryrun)
|
|
+ {
|
|
+ addr.addr.rcode.rcode = NOTIMP;
|
|
+ log_query(F_CONFIG | F_RCODE, name, &addr, NULL);
|
|
+ }
|
|
+ ans = 1;
|
|
+ }
|
|
}
|
|
}
|
|
|