--- boreas/util.c 2021-02-01 10:20:11.000000000 -0500 +++ boreas/util.c 2021-02-18 13:25:46.406205000 -0500 @@ -21,13 +21,20 @@ #include "../base/networking.h" /* for range_t */ +#include +#include +#include #include #include #include /* for getifaddrs() */ -#include #include #include /* for if_nametoindex() */ -#include /* for sockaddr_ll */ +#ifdef AF_LINK +# include +#endif +#ifdef AF_PACKET +# include +#endif #include #include #include @@ -111,22 +118,22 @@ { for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { - if ((ifa->ifa_addr) && (ifa->ifa_addr->sa_family == AF_PACKET) + if ((ifa->ifa_addr) && (ifa->ifa_addr->sa_family == AF_LINK) && !(ifa->ifa_flags & (IFF_LOOPBACK))) { if (interface_provided) { if (g_strcmp0 (interface, ifa->ifa_name) == 0) { - struct sockaddr_ll *s = - (struct sockaddr_ll *) ifa->ifa_addr; - memcpy (mac, s->sll_addr, 6 * sizeof (uint8_t)); + struct sockaddr_dl *s = + (struct sockaddr_dl *) ifa->ifa_addr; + memcpy (mac, s->sdl_data, 6 * sizeof (uint8_t)); } } else { - struct sockaddr_ll *s = (struct sockaddr_ll *) ifa->ifa_addr; - memcpy (mac, s->sll_addr, 6 * sizeof (uint8_t)); + struct sockaddr_dl *s = (struct sockaddr_dl *) ifa->ifa_addr; + memcpy (mac, s->sdl_data, 6 * sizeof (uint8_t)); } } } @@ -516,7 +523,7 @@ break; case ARPV4: { - soc = socket (PF_PACKET, SOCK_RAW, htons (ETH_P_ALL)); + soc = socket (PF_LINK, SOCK_RAW, 0); if (soc < 0) { g_warning ("%s: failed to open ARPV4 socket: %s", __func__, @@ -628,7 +635,7 @@ so_sndbuf_empty (int soc, int *err) { int cur_so_sendbuf = -1; - if (ioctl (soc, SIOCOUTQ, &cur_so_sendbuf) == -1) + if (ioctl (soc, TIOCOUTQ, &cur_so_sendbuf) == -1) { g_warning ("%s: ioctl error: %s", __func__, strerror (errno)); *err = -1;