CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-10-21 03:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't fatal() on iflist if npcap isn't found

Browse source
This commit is contained in:
dmiller 2018-11-21 03:43:10 +00:00
parent bff7dcad4e
commit 33f16dd075
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
output.cc
View file

@ -309,16 +309,18 @@ void win32_fatal_raw_sockets(const char *devname) {
words the names of interfaces Nmap has no way of using.*/
static void print_iflist_pcap_mapping(const struct interface_info *iflist,
int numifs) {
pcap_if_t *pcap_ifs;
pcap_if_t *pcap_ifs = NULL;
std::list<const pcap_if_t *> leftover_pcap_ifs;
std::list<const pcap_if_t *>::iterator leftover_p;
int i;
/* Build a list of "leftover" libpcap interfaces. Initially it contains all
the interfaces. */
pcap_ifs = getpcapinterfaces();
for (const pcap_if_t *p = pcap_ifs; p != NULL; p = p->next)
leftover_pcap_ifs.push_front(p);
if (o.have_pcap) {
pcap_ifs = getpcapinterfaces();
for (const pcap_if_t *p = pcap_ifs; p != NULL; p = p->next)
leftover_pcap_ifs.push_front(p);
}
if (numifs > 0 || !leftover_pcap_ifs.empty()) {
NmapOutputTable Tbl(1 + numifs + leftover_pcap_ifs.size(), 2);
@ -362,7 +364,9 @@ static void print_iflist_pcap_mapping(const struct interface_info *iflist,
log_flush_all();
}
pcap_freealldevs(pcap_ifs);
if (pcap_ifs) {
pcap_freealldevs(pcap_ifs);
}
}
#endif