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

Remove extact-MAC address from DUID code.

Browse Source
This commit is contained in:
Simon Kelley
2012-02-15 10:41:03 +00:00
parent caa94380ac
commit 60ac5af682
1 changed files with 7 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/dhcp6.c
View File

@@ -408,44 +408,18 @@ struct dhcp_config *find_config6(struct dhcp_config *configs,
unsigned char *duid, int duid_len, unsigned char *duid, int duid_len,
char *hostname) char *hostname)
{ {
int count, new;
struct dhcp_config *config; struct dhcp_config *config;
struct hwaddr_config *conf_addr;
unsigned char *hwaddr = NULL;
int duid_type, hw_len = 0, hw_type = 0;
if (duid)
{
for (config = configs; config; config = config->next)
if (config->flags & CONFIG_CLID)
{
if (config->clid_len == duid_len &&
memcmp(config->clid, duid, duid_len) == 0 &&
is_addr_in_context6(context, config))
return config;
}
/* DHCPv6 doesn't deal in MAC addresses per-se, but some DUIDs do include if (duid)
MAC addresses, so we try and parse them out here. Not that there is only one for (config = configs; config; config = config->next)
DUID per host and it's created using any one of the MACs, so this is no if (config->flags & CONFIG_CLID)
good no good for multihomed hosts. */
hwaddr = duid;
GETSHORT(duid_type, hwaddr);
if (duid_type == 1 || duid_type == 3)
{ {
GETSHORT(hw_type, hwaddr); if (config->clid_len == duid_len &&
if (duid_type == 1) memcmp(config->clid, duid, duid_len) == 0 &&
hwaddr += 4; /* skip time */
hw_len = duid_len - 8;
}
if (hwaddr)
for (config = configs; config; config = config->next)
if (config_has_mac(config, hwaddr, hw_len, hw_type) &&
is_addr_in_context6(context, config)) is_addr_in_context6(context, config))
return config; return config;
} }
if (hostname && context) if (hostname && context)
for (config = configs; config; config = config->next) for (config = configs; config; config = config->next)
if ((config->flags & CONFIG_NAME) && if ((config->flags & CONFIG_NAME) &&
@@ -453,26 +427,6 @@ struct dhcp_config *find_config6(struct dhcp_config *configs,
is_addr_in_context6(context, config)) is_addr_in_context6(context, config))
return config; return config;
/* use match with fewest wildcard octets */
if (hwaddr)
{
struct dhcp_config *candidate;
for (candidate = NULL, count = 0, config = configs; config; config = config->next)
if (is_addr_in_context6(context, config))
for (conf_addr = config->hwaddr; conf_addr; conf_addr = conf_addr->next)
if (conf_addr->wildcard_mask != 0 &&
conf_addr->hwaddr_len == hw_len &&
(conf_addr->hwaddr_type == hw_type || conf_addr->hwaddr_type == 0) &&
(new = memcmp_masked(conf_addr->hwaddr, hwaddr, hw_len, conf_addr->wildcard_mask)) > count)
{
count = new;
candidate = config;
}
return candidate;
}
return NULL; return NULL;
} }