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

tidying

Browse Source
This commit is contained in:
Simon Kelley
2012-03-07 20:39:40 +00:00
parent bc26f9a03f
commit 3803437dcc
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/lease.c
View File

@@ -418,37 +418,31 @@ void lease_update_dns(void)
{ {
struct in6_addr addr = map->subnet; struct in6_addr addr = map->subnet;
if (lease->hwaddr_len == 6 && if (lease->hwaddr_len == 6 &&
(lease->hwaddr_type == ARPHRD_ETHER || (lease->hwaddr_type == ARPHRD_ETHER || lease->hwaddr_type == ARPHRD_IEEE802))
lease->hwaddr_type == ARPHRD_IEEE802))
{ {
/* convert MAC address to EUI-64 */ /* convert MAC address to EUI-64 */
memcpy(&addr.s6_addr[8], lease->hwaddr, 3); memcpy(&addr.s6_addr[8], lease->hwaddr, 3);
memcpy(&addr.s6_addr[13], &lease->hwaddr[3], 3); memcpy(&addr.s6_addr[13], &lease->hwaddr[3], 3);
addr.s6_addr[11] = 0xff; addr.s6_addr[11] = 0xff;
addr.s6_addr[12] = 0xfe; addr.s6_addr[12] = 0xfe;
addr.s6_addr[8] ^= 0x02;
} }
#if defined(ARPHRD_EUI64) #if defined(ARPHRD_EUI64)
else if (lease->hwaddr_len == 8 && else if (lease->hwaddr_len == 8 &&
lease->hwaddr_type == ARPHRD_EUI64) lease->hwaddr_type == ARPHRD_EUI64)
{ memcpy(&addr.s6_addr[8], lease->hwaddr, 8);
memcpy(&addr.s6_addr[8], &lease->hwaddr, 8);
addr.s6_addr[8] ^= 0x02;
}
#endif #endif
#if defined(ARPHRD_IEEE1394) && defined(ARPHRD_EUI64) #if defined(ARPHRD_IEEE1394) && defined(ARPHRD_EUI64)
else if (lease->clid_len == 9 && else if (lease->clid_len == 9 &&
lease->clid[0] == ARPHRD_EUI64 && lease->clid[0] == ARPHRD_EUI64 &&
lease->hwaddr_type == ARPHRD_IEEE1394) lease->hwaddr_type == ARPHRD_IEEE1394)
{ /* firewire has EUI-64 identifier as clid */
/* firewire has EUI-64 identifier as clid */ memcpy(&addr.s6_addr[8], &lease->clid[1], 8);
memcpy(&addr.s6_addr[8], &lease->clid[1], 8);
addr.s6_addr[8] ^= 0x02;
}
#endif #endif
else else
continue; continue;
addr.s6_addr[8] ^= 0x02;
if (lease->fqdn) if (lease->fqdn)
cache_add_dhcp_entry(lease->fqdn, AF_INET6, (struct all_addr *)&addr, lease->expires); cache_add_dhcp_entry(lease->fqdn, AF_INET6, (struct all_addr *)&addr, lease->expires);
if (!option_bool(OPT_DHCP_FQDN) && lease->hostname) if (!option_bool(OPT_DHCP_FQDN) && lease->hostname)