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

Merge commit 43acbb77a8e0b3346b574b3e28793de2d6985e69 from libpcap

Browse Source 
upstream (git://bpf.tcpdump.org/libpcap). This is a workaround for the
BIOCSRTIMEOUT bug in 10.6, 10.6.1, and 10.6.3 that doesn't work for
non-integer timeouts. A symptom of being affected by the bug is Nmap
haning forever at the first call to pcap_next. 10.6.2 was somehow not
affected.

This alone still doesn't solve the problem; I still have to make the
default --with-libpcap=included for 64-bit OS X.

The source comment is informative:
/*
 * XXX - Mac OS X 10.6 mishandles BIOCSRTIMEOUT in 64-bit userland - it
 * takes, as an argument, a "struct BPF_TIMEVAL", which has 32-bit
 * tv_sec and tv_usec, rather than a "struct timeval".
 *
 * If this platform defines "struct BPF_TIMEVAL", we check whether the
 * structure size in BIOCSRTIMEOUT is that of a "struct timeval" and, if
 * not, we use a "struct BPF_TIMEVAL" rather than a "struct timeval".
 * (That way, if the bug is fixed in a future release, we will still do
 * the right thing.)
 */

commit 43acbb77a8e0b3346b574b3e28793de2d6985e69
Author: Guy Harris <guy@alum.mit.edu>
Date:   Sun Oct 11 11:05:46 2009 -0700

    Work around an annoying Snow Leopard BPF bug that causes sub-second
    timeouts not to work in 64-bit userland code (Snow Leopard's GCC builds
    64-bit by default on 64-bit machines).
This commit is contained in:
david
2010-04-19 19:22:01 +00:00
parent 0a22176263
commit dedbb7f6ee
4 changed files with 175 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
libpcap/pcap-bpf.c
View File

@@ -1859,16 +1859,45 @@ pcap_activate_bpf(pcap_t *p)
* XXX - is this seconds/nanoseconds in AIX?
* (Treating it as such doesn't fix the timeout
* problem described below.)
*
* XXX - Mac OS X 10.6 mishandles BIOCSRTIMEOUT in
* 64-bit userland - it takes, as an argument, a
* "struct BPF_TIMEVAL", which has 32-bit tv_sec
* and tv_usec, rather than a "struct timeval".
*
* If this platform defines "struct BPF_TIMEVAL",
* we check whether the structure size in BIOCSRTIMEOUT
* is that of a "struct timeval" and, if not, we use
* a "struct BPF_TIMEVAL" rather than a "struct timeval".
* (That way, if the bug is fixed in a future release,
* we will still do the right thing.)
*/
struct timeval to;
to.tv_sec = p->md.timeout / 1000;
to.tv_usec = (p->md.timeout * 1000) % 1000000;
if (ioctl(p->fd, BIOCSRTIMEOUT, (caddr_t)&to) < 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "BIOCSRTIMEOUT: %s",
pcap_strerror(errno));
status = PCAP_ERROR;
goto bad;
#ifdef HAVE_STRUCT_BPF_TIMEVAL
struct BPF_TIMEVAL bpf_to;
if (IOCPARM_LEN(BIOCSRTIMEOUT) != sizeof(struct timeval)) {
bpf_to.tv_sec = p->md.timeout / 1000;
bpf_to.tv_usec = (p->md.timeout * 1000) % 1000000;
if (ioctl(p->fd, BIOCSRTIMEOUT, (caddr_t)&bpf_to) < 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
"BIOCSRTIMEOUT: %s", pcap_strerror(errno));
status = PCAP_ERROR;
goto bad;
}
} else {
#endif
to.tv_sec = p->md.timeout / 1000;
to.tv_usec = (p->md.timeout * 1000) % 1000000;
if (ioctl(p->fd, BIOCSRTIMEOUT, (caddr_t)&to) < 0) {
snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
"BIOCSRTIMEOUT: %s", pcap_strerror(errno));
status = PCAP_ERROR;
goto bad;
}
#ifdef HAVE_STRUCT_BPF_TIMEVAL
}
#endif
}
#ifdef _AIX