1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-26 17:39:03 +00:00

Inline getpcapinterfaces, used in only 1 location

This commit is contained in:
dmiller
2020-01-14 03:39:25 +00:00
parent 86f80305a1
commit 7faec7f157
3 changed files with 4 additions and 28 deletions

View File

@@ -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<const pcap_if_t *> leftover_pcap_ifs;
std::list<const pcap_if_t *>::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);
}