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

Fix entries in /etc/hosts disabling static leases.

Browse Source 
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.
This commit is contained in:
Steven Siloti
2019-01-13 22:56:36 +00:00
committed by Simon Kelley
parent f8c77edbdf
commit 18eac67c0a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dhcp-common.c
View File

@@ -372,7 +372,11 @@ void dhcp_update_configs(struct dhcp_config *configs)
for (config = configs; config; config = config->next) for (config = configs; config; config = config->next)
if (config->flags & CONFIG_ADDR_HOSTS) 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 #ifdef HAVE_DHCP6
again: again:
@@ -421,7 +425,7 @@ void dhcp_update_configs(struct dhcp_config *configs)
(!(conf_tmp = config_find_by_address6(configs, &crec->addr.addr6, 128, 0)) || conf_tmp == config)) (!(conf_tmp = config_find_by_address6(configs, &crec->addr.addr6, 128, 0)) || conf_tmp == config))
{ {
memcpy(&config->addr6, &crec->addr.addr6, IN6ADDRSZ); memcpy(&config->addr6, &crec->addr.addr6, IN6ADDRSZ);
config->flags |= CONFIG_ADDR6 | CONFIG_ADDR_HOSTS; config->flags |= CONFIG_ADDR6 | CONFIG_ADDR6_HOSTS;
continue; continue;
} }
#endif #endif

1
src/dnsmasq.h
View File

@@ -789,6 +789,7 @@ struct dhcp_config {
#define CONFIG_BANK 2048 /* from dhcp hosts file */ #define CONFIG_BANK 2048 /* from dhcp hosts file */
#define CONFIG_ADDR6 4096 #define CONFIG_ADDR6 4096
#define CONFIG_WILDCARD 8192 #define CONFIG_WILDCARD 8192
#define CONFIG_ADDR6_HOSTS 16384 /* address added by from /etc/hosts */
struct dhcp_opt { struct dhcp_opt {
int opt, len, flags; int opt, len, flags;