diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2018-12-17 16:36:44 +0000 |
---|---|---|
committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2019-01-16 15:39:54 +0000 |
commit | 7541d30c9c2946fe112d7966f9d1e7456725c324 (patch) | |
tree | a1b250d30b31700e8c9bb77d511c9c76646700e8 /package/network/services/dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch | |
parent | 63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9 (diff) | |
download | upstream-7541d30c9c2946fe112d7966f9d1e7456725c324.tar.gz upstream-7541d30c9c2946fe112d7966f9d1e7456725c324.tar.bz2 upstream-7541d30c9c2946fe112d7966f9d1e7456725c324.zip |
dnsmasq: backport latest pre2.81 patches
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>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch')
-rw-r--r-- | package/network/services/dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch b/package/network/services/dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch new file mode 100644 index 0000000000..265bd3fc9e --- /dev/null +++ b/package/network/services/dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch @@ -0,0 +1,54 @@ +From 18eac67c0a15b673c8d27002c248651b308093e4 Mon Sep 17 00:00:00 2001 +From: Steven Siloti <ssiloti@gmail.com> +Date: Sun, 13 Jan 2019 22:56:36 +0000 +Subject: [PATCH 30/30] Fix entries in /etc/hosts disabling static leases. + +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> +--- + src/dhcp-common.c | 8 ++++++-- + src/dnsmasq.h | 1 + + 2 files changed, 7 insertions(+), 2 deletions(-) + +--- a/src/dhcp-common.c ++++ b/src/dhcp-common.c +@@ -372,7 +372,11 @@ void dhcp_update_configs(struct dhcp_con + + for (config = configs; config; config = config->next) + if (config->flags & CONFIG_ADDR_HOSTS) +- config->flags &= ~(CONFIG_ADDR | CONFIG_ADDR6 | CONFIG_ADDR_HOSTS); ++ config->flags &= ~(CONFIG_ADDR | CONFIG_ADDR_HOSTS); ++#ifdef HAVE_DHCP6 ++ if (config->flags & CONFIG_ADDR6_HOSTS) ++ config->flags &= ~(CONFIG_ADDR6 | CONFIG_ADDR6_HOSTS); ++#endif + + #ifdef HAVE_DHCP6 + again: +@@ -421,7 +425,7 @@ void dhcp_update_configs(struct dhcp_con + (!(conf_tmp = config_find_by_address6(configs, &crec->addr.addr6, 128, 0)) || conf_tmp == config)) + { + memcpy(&config->addr6, &crec->addr.addr6, IN6ADDRSZ); +- config->flags |= CONFIG_ADDR6 | CONFIG_ADDR_HOSTS; ++ config->flags |= CONFIG_ADDR6 | CONFIG_ADDR6_HOSTS; + continue; + } + #endif +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -789,6 +789,7 @@ struct dhcp_config { + #define CONFIG_BANK 2048 /* from dhcp hosts file */ + #define CONFIG_ADDR6 4096 + #define CONFIG_WILDCARD 8192 ++#define CONFIG_ADDR6_HOSTS 16384 /* address added by from /etc/hosts */ + + struct dhcp_opt { + int opt, len, flags; |