diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-09-29 17:02:17 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-09-29 17:02:17 -0700 |
| commit | 74f248dda6bda79612154150efb9300aa6451941 (patch) | |
| tree | 1ab08d7f5d941540a9c4b2c9716217ba637b1b29 | |
| parent | 50594b37d959f84701b12876af95828e20f3d82a (diff) | |
More findalldevs fixes.
| -rw-r--r-- | pcap-dbus.c | 6 | ||||
| -rw-r--r-- | pcap-netfilter-linux.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pcap-dbus.c b/pcap-dbus.c index eb856355..c878353b 100644 --- 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) { - 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; - 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; } diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c index 30719d1b..aa8edbba 100644 --- 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) { - pcap_if_t *found_dev = *alldevsp; 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); - 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; - 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; } |