More findalldevs fixes.

diff --git a/pcap-dbus.c b/pcap-dbus.c
index eb856355857ee585f7ddea3d2af0a63c5d64ec37..c878353b9f4bfd1ee9ebdf65965b72669fb90079 100644 (file)
--- a/pcap-dbus.c
+++ b/pcap-dbus.c
@@ -270,11 +270,9 @@ dbus_create(const char *device, char *ebuf, int *is_ours)
 int 
 dbus_findalldevs(pcap_if_t **alldevsp, char *err_str)
 {
 int 
 dbus_findalldevs(pcap_if_t **alldevsp, char *err_str)
 {

-       pcap_if_t *found_dev = *alldevsp;
-
-       if (pcap_add_if(&found_dev, "dbus-system", 0, "D-Bus system bus", err_str) < 0)
+       if (pcap_add_if(alldevsp, "dbus-system", 0, "D-Bus system bus", err_str) < 0)

                return -1;
                return -1;

-       if (pcap_add_if(&found_dev, "dbus-session", 0, "D-Bus session bus", err_str) < 0)
+       if (pcap_add_if(alldevsp, "dbus-session", 0, "D-Bus session bus", err_str) < 0)

                return -1;
        return 0;
 }
                return -1;
        return 0;
 }

diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c
index 30719d1bf589bf7793592a21ba18f81d46e39f11..aa8edbba777234de947ce8e89a59286947ff8b19 100644 (file)
--- a/pcap-netfilter-linux.c
+++ b/pcap-netfilter-linux.c
@@ -632,7 +632,6 @@ netfilter_create(const char *device, char *ebuf, int *is_ours)
 int 
 netfilter_findalldevs(pcap_if_t **alldevsp, char *err_str)
 {
 int 
 netfilter_findalldevs(pcap_if_t **alldevsp, char *err_str)
 {

-       pcap_if_t *found_dev = *alldevsp;

        int sock;
        
        sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER);
        int sock;
        
        sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER);


@@ -646,9 +645,9 @@ netfilter_findalldevs(pcap_if_t **alldevsp, char *err_str)
        }
        close(sock);
 
        }
        close(sock);
 

-       if (pcap_add_if(&found_dev, NFLOG_IFACE, 0, "Linux netfilter log (NFLOG) interface", err_str) < 0)
+       if (pcap_add_if(alldevsp, NFLOG_IFACE, 0, "Linux netfilter log (NFLOG) interface", err_str) < 0)

                return -1;
                return -1;

-       if (pcap_add_if(&found_dev, NFQUEUE_IFACE, 0, "Linux netfilter queue (NFQUEUE) interface", err_str) < 0)
+       if (pcap_add_if(alldevsp, NFQUEUE_IFACE, 0, "Linux netfilter queue (NFQUEUE) interface", err_str) < 0)

                return -1;
        return 0;
 }
                return -1;
        return 0;
 }