Ticket #2246: pcap.diff

libpcap/pcap-haiku.cpp

@@ -250 +250 @@
 extern "C" int
 pcap_platform_finddevs(pcap_if_t** _allDevices, char* errorBuffer)
 {
+    // If Haiku supports a Linux-like pseudo device, it should be
+    // added here.  See pcap-linux.c for more info.
+    int flags;
+
     // we need a socket to talk to the networking stack
     int socket = ::socket(AF_INET, SOCK_DGRAM, 0);
     if (socket < 0) {
@@ -290 +294 @@
     }
 
     ifreq *interface = (ifreq *)buffer;
-    pcap_if_t* last = NULL;
 
     for (uint32 i = 0; i < count; i++) {
-        pcap_if_t* pcapInterface = (pcap_if_t*)malloc(sizeof(pcap_if_t));
-        if (pcapInterface == NULL)
-            continue;
+        flags = 0;
 
-        if (last == NULL)
-            *_allDevices = pcapInterface;
-        else
-            last->next = pcapInterface;
-
-        pcapInterface->next = NULL;
-        pcapInterface->name = strdup(interface->ifr_name);
-        pcapInterface->description = NULL;
-        pcapInterface->addresses = NULL;
-        pcapInterface->flags = 0;
-
         // get interface type
 
         int linkSocket = ::socket(AF_LINK, SOCK_DGRAM, 0);
@@ -331 +321 @@
                     sockaddr_dl &link = *(sockaddr_dl *)&request.ifr_addr;
 
                     if (link.sdl_type == IFT_LOOP)
-                        pcapInterface->flags = PCAP_IF_LOOPBACK;
+                        flags = IFF_LOOPBACK;
                 }
             }
             close(linkSocket);
         }
 
+        pcap_add_if(_allDevices, interface->ifr_name, flags, NULL, errorBuffer);
+
         interface = (ifreq *)((addr_t)interface + IF_NAMESIZE
             + interface->ifr_addr.sa_len);
     }

config.h

@@ -192 +192 @@
 /* #undef HAVE_PCAP_DUMP_FLUSH */
 
 /* Define to 1 if you have the `pcap_findalldevs' function. */
-/* #undef HAVE_PCAP_FINDALLDEVS */
+#define HAVE_PCAP_FINDALLDEVS 1
 
 /* Define to 1 if the system has the type `pcap_if_t'. */
-/* #undef HAVE_PCAP_IF_T */
+#define HAVE_PCAP_IF_T 1
 
 /* Define to 1 if you have the `pcap_lib_version' function. */
 /* #undef HAVE_PCAP_LIB_VERSION */