PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-15 04:09:01 +00:00
Code Issues Projects Releases Wiki Activity

fix Mac OS X pcap problem, I hope

Browse Source
This commit is contained in:
fyodor
2006-11-19 09:35:26 +00:00
parent 9a1fece75d
commit 508e674ce4
6 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tcpip.cc
View File

@@ -1844,12 +1844,9 @@ if (!pd) fatal("NULL packet device passed to readip_pcap");
gettimeofday(&tv_start, NULL);
}
// Add other systems here if they don't support select()able pcap descriptors
#ifdef WIN32
pcap_descriptor = -1;
#else
pcap_descriptor = pcap_get_selectable_fd(pd);
#endif
if (pcap_selectable_fd_valid())
pcap_descriptor = pcap_get_selectable_fd(pd);
do {
#ifdef WIN32
@@ -1950,6 +1947,16 @@ if (timedout) {
return alignedbuf;
}
// Returns whether the system supports pcap_get_selectable_fd() properly
bool pcap_selectable_fd_valid() {
#if defined(WIN32) || defined(MACOSX)
return false;
#endif
return true;
}
// Returns whether the packet receive time value obtained from libpcap
// (and thus by readip_pcap()) should be considered valid. When
@@ -2069,13 +2076,10 @@ int read_arp_reply_pcap(pcap_t *pd, u8 *sendermac, struct in_addr *senderIP,
}
#endif
// Add other systems here if they don't support select()able pcap descriptors
#ifdef WIN32
pcap_descriptor = -1;
#else
pcap_descriptor = pcap_get_selectable_fd(pd);
#endif
pcap_descriptor = -1;
if (pcap_selectable_fd_valid())
pcap_descriptor = pcap_get_selectable_fd(pd);
p = NULL;
if (pcap_descriptor != -1) {
fd_set rfds;