diff --git a/output.cc b/output.cc index fb6e911ed..8d7bcc53d 100644 --- a/output.cc +++ b/output.cc @@ -311,6 +311,7 @@ void win32_fatal_raw_sockets(const char *devname) { static void print_iflist_pcap_mapping(const struct interface_info *iflist, int numifs) { pcap_if_t *pcap_ifs = NULL; + char errbuf[PCAP_ERRBUF_SIZE]; std::list leftover_pcap_ifs; std::list::iterator leftover_p; int i; @@ -318,7 +319,9 @@ static void print_iflist_pcap_mapping(const struct interface_info *iflist, /* Build a list of "leftover" libpcap interfaces. Initially it contains all the interfaces. */ if (o.have_pcap) { - pcap_ifs = getpcapinterfaces(); + if (pcap_findalldevs(&p_ifaces, errbuf) == -1) { + fatal("pcap_findalldevs(): Cannot retrieve pcap interfaces: %s", errbuf); + } for (const pcap_if_t *p = pcap_ifs; p != NULL; p = p->next) leftover_pcap_ifs.push_front(p); } diff --git a/tcpip.cc b/tcpip.cc index 174373b38..4dd003fda 100644 --- a/tcpip.cc +++ b/tcpip.cc @@ -1774,29 +1774,6 @@ bool getNextHopMAC(const char *iface, const u8 *srcmac, const struct sockaddr_st } - - - - - - -pcap_if_t *getpcapinterfaces() { -#ifndef WIN32 - return NULL; -#endif - pcap_if_t *p_ifaces; - char errbuf[PCAP_ERRBUF_SIZE]; - - if ((pcap_findalldevs(&p_ifaces, errbuf)) == -1) { - fatal("pcap_findalldevs(): Cannot retrieve pcap interfaces: %s", errbuf); - return NULL; - } - return p_ifaces; -} - - - - int nmap_route_dst(const struct sockaddr_storage *dst, struct route_nfo *rnfo) { struct sockaddr_storage spoofss; size_t spoofsslen; diff --git a/tcpip.h b/tcpip.h index 35c1813ef..538622aa2 100644 --- a/tcpip.h +++ b/tcpip.h @@ -393,10 +393,6 @@ int readudppacket(const u8 *packet, int readdata); the interface_info for the first one found. If non found, returns NULL */ struct interface_info *getInterfaceByIP(struct sockaddr_storage *ss); - -pcap_if_t *getpcapinterfaces(); - - /* Fill buf (up to buflen -- truncate if necessary but always terminate) with a short representation of the packet stats. Returns buf. Aborts if there is a problem. */