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

Fixed typos and tested.

Browse Source
This commit is contained in:
Simon Kelley
2012-03-07 20:25:39 +00:00
parent 08456c61f6
commit 96fafe2ed6
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bpf.c
View File

@@ -44,7 +44,7 @@ int arp_enumerate(void *parm, int (*callback)())
int rc; int rc;
buff.iov_base = NULL; buff.iov_base = NULL;
buff.iov_len = 0 buff.iov_len = 0;
mib[0] = CTL_NET; mib[0] = CTL_NET;
mib[1] = PF_ROUTE; mib[1] = PF_ROUTE;
@@ -88,6 +88,7 @@ int arp_enumerate(void *parm, int (*callback)())
int iface_enumerate(int family, void *parm, int (*callback)()) int iface_enumerate(int family, void *parm, int (*callback)())
{ {
struct ifaddrs *head, *addrs; struct ifaddrs *head, *addrs;
int errsav, ret = 0;
if (family == AF_UNSPEC) if (family == AF_UNSPEC)
#if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__)
@@ -105,7 +106,7 @@ int iface_enumerate(int family, void *parm, int (*callback)())
for (addrs = head; addrs; addrs = addrs->ifa_next) for (addrs = head; addrs; addrs = addrs->ifa_next)
{ {
if (addrs->ifa_addr.sa_family == family) if (addrs->ifa_addr->sa_family == family)
{ {
int iface_index = if_nametoindex(addrs->ifa_name); int iface_index = if_nametoindex(addrs->ifa_name);
@@ -125,15 +126,15 @@ int iface_enumerate(int family, void *parm, int (*callback)())
else if (family == AF_INET6) else if (family == AF_INET6)
{ {
struct in6_addr *addr = &((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_addr; struct in6_addr *addr = &((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_addr;
unsigned char *netmask = &(unisgned char *) addrs->ifa_netmask)->sin6_addr; unsigned char *netmask = (unsigned char *) &((struct sockaddr_in6 *) addrs->ifa_netmask)->sin6_addr;
int scope_id = &((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_scope_id; int scope_id = ((struct sockaddr_in6 *) addrs->ifa_addr)->sin6_scope_id;
int i, j, prefix = 0; int i, j, prefix = 0;
for (i = 0; i < IN6_ADDRSZ; i++, prefix += 8) for (i = 0; i < IN6ADDRSZ; i++, prefix += 8)
if (netmask[i] != 0xff) if (netmask[i] != 0xff)
break; break;
if (i != IN6_ADDRSZ && netmask[i]) if (i != IN6ADDRSZ && netmask[i])
for (j = 7; j > 0; j--, prefix++) for (j = 7; j > 0; j--, prefix++)
if ((netmask[i] & (1 << j)) == 0) if ((netmask[i] & (1 << j)) == 0)
break; break;
@@ -153,7 +154,7 @@ int iface_enumerate(int family, void *parm, int (*callback)())
else if (family == AF_LINK) else if (family == AF_LINK)
{ {
/* Assume ethernet again here */ /* Assume ethernet again here */
struct sockaddr_dl *sdl = (struct sockaddr_dl *)&ifa->ifr_addr; struct sockaddr_dl *sdl = (struct sockaddr_dl *) addrs->ifa_addr;
if (sdl->sdl_alen != 0 && if (sdl->sdl_alen != 0 &&
!((*callback)(iface_index, ARPHRD_ETHER, LLADDR(sdl), sdl->sdl_alen, parm))) !((*callback)(iface_index, ARPHRD_ETHER, LLADDR(sdl), sdl->sdl_alen, parm)))
goto err; goto err;