78 lines
2.6 KiB
Text
78 lines
2.6 KiB
Text
|
Index: boreas/util.c
|
||
|
|
--- boreas/util.c.orig
|
||
|
|
+++ boreas/util.c
|
||
|
|
@@ -21,17 +21,22 @@
|
||
|
|
|
||
|
|
#include "../base/networking.h" /* for range_t */
|
||
|
|
|
||
|
|
+#include <stdio.h>
|
||
|
|
+#include <sys/types.h>
|
||
|
|
+#include <sys/socket.h>
|
||
|
|
#include <errno.h>
|
||
|
|
#include <glib.h>
|
||
|
|
#include <ifaddrs.h> /* for getifaddrs() */
|
||
|
|
-#include <linux/sockios.h>
|
||
|
|
-#include <net/ethernet.h>
|
||
|
|
#include <net/if.h> /* for if_nametoindex() */
|
||
|
|
-#include <netpacket/packet.h> /* for sockaddr_ll */
|
||
|
|
+#ifdef AF_LINK
|
||
|
|
+# include <net/if_dl.h>
|
||
|
|
+#endif
|
||
|
|
+#ifdef AF_PACKET
|
||
|
|
+# include <netpacket/packet.h>
|
||
|
|
+#endif
|
||
|
|
#include <stdlib.h>
|
||
|
|
#include <string.h>
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
-#include <sys/socket.h>
|
||
|
|
#include <unistd.h>
|
||
|
|
|
||
|
|
#undef G_LOG_DOMAIN
|
||
|
|
@@ -111,22 +116,22 @@ get_source_mac_addr (char *interface, uint8_t *mac)
|
||
|
|
{
|
||
|
|
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 +521,7 @@ set_socket (socket_type_t socket_type, int *scanner_so
|
||
|
|
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 +633,7 @@ static int
|
||
|
|
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;
|