for (ifa = ifaddr; ifa; ifa = ifa->ifa_next)
{
- if (strcmp(dev->name, ifa->ifa_name))
+ if (!ifa->ifa_addr || strcmp(dev->name, ifa->ifa_name))
continue;
if (ifa->ifa_addr->sa_family == AF_INET)
fw3_bitlen2netmask(int family, int bits, void *mask)
{
int i;
+ uint8_t rem, b;
struct in_addr *v4;
struct in6_addr *v6;
return false;
v6 = mask;
- i = abs(bits);
+ rem = abs(bits);
- memset(v6->s6_addr, 0xff, i / 8);
- memset(v6->s6_addr + (i / 8) + 1, 0, (128 - i) / 8);
- v6->s6_addr[i / 8] = 0xff << (8 - (i & 7));
+ for (i = 0; i < sizeof(v6->s6_addr); i++)
+ {
+ b = (rem > 8) ? 8 : rem;
+ v6->s6_addr[i] = (uint8_t)(0xFF << (8 - b));
+ rem -= b;
+ }
if (bits < 0)
- for (i = 0; i < 16; i++)
+ for (i = 0; i < sizeof(v6->s6_addr); i++)
v6->s6_addr[i] = ~v6->s6_addr[i];
}
else
{
for (ifa = ifaddr; ifa && !found; ifa = ifa->ifa_next)
{
- if (strcmp(dev->name, ifa->ifa_name))
+ if (!ifa->ifa_addr || strcmp(dev->name, ifa->ifa_name))
continue;
sin = (struct sockaddr_in *)ifa->ifa_addr;