1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-14 19:59:02 +00:00
Commit Graph

8 Commits

Author SHA1 Message Date
david
5d24d23600 Update libpcap to 1.2.1. 2012-04-10 00:47:45 +00:00
david
7197d18d52 Cherry-pick changes to require <linux/compiler.h>.
I needed this to build with --with-libpcap=included on Linux 2.6.16,
otherwise I got this error:

gcc -g -O2 -O2 -fpic -I.  -DHAVE_CONFIG_H  -D_U_="__attribute__((unused))" -c ./pcap-usb-linux.c
./pcap-usb-linux.c: In function ‘probe_devices’:
./pcap-usb-linux.c:234: error: storage size of ‘ctrl’ isn’t known
./pcap-usb-linux.c:279: error: ‘USBDEVFS_CONTROL’ undeclared (first use in this function)
./pcap-usb-linux.c:279: error: (Each undeclared identifier is reported only once
./pcap-usb-linux.c:279: error: for each function it appears in.)
make[1]: *** [pcap-usb-linux.o] Error 1

commit a092bafeee07c97352d2c6d06780220286ab2db0
Author: Guy Harris <guy@alum.mit.edu>
Date:   Tue Nov 30 15:52:45 2010 -0800

    In test programs, just as in pcap-usb-linux.c, if we have
    <linux/compiler.h> we (probably need to include it before including
    <linux/usbdevice_fs.h>, otherwise the test may fail when it shouldn't.

commit b019cc06cb4fdc01f99a36581fe7b55e2533d663
Author: Guy Harris <guy@alum.mit.edu>
Date:   Thu Nov 25 14:06:01 2010 -0800

    Check whether we have <linux/compiler.h>.

    Not all distributions have it in /usr/include; I guess the ones that
    don't have it have versions of other kernel headers that don't require
    it.

commit 0920898be2ede72baafa2a02e77ea223ecbe4f9a
Author: Guy Harris <guy@alum.mit.edu>
Date:   Thu Nov 25 13:49:16 2010 -0800

    Include <linux/compiler.h> before including <linux/usbdevice_fs.h>.

    Some versions of the Linux kernel require that.

commit 85089fea5732acc004dcc7e6aebcb0510c37f675
Author: Guy Harris <guy@alum.mit.edu>
Date:   Fri Jun 4 10:48:16 2010 -0700

    Do filtering on USB and Bluetooth capturing.

    Do the standard userland filtering on USB and Bluetooth captures, rather
    than returning "success" when the filter is installed without doing
    anything with the filter.

    Also, squelch some "dereferencing type-punned pointer will break
    strict-aliasing rules" warnings in pcap-bt-linux.c, by using memcpy
    rather than pointer-casting.
2011-10-27 15:38:30 +00:00
david
38019ded5c o [libpcap] Added a --disable-packet-ring option to force the use of
an older, slower packet capture mechanism on Linux. Before Linux
  2.6.27, the packet ring mechanism uses different-sized kernel
  structures on 32- and 64-bit architectures, so a 32-bit program will
  not run correctly on a 64-bit kernel. The older mechanism does not
  have this flaw.
2010-05-26 20:43:09 +00:00
david
4ac98563ab Upgrade our included libpcap to 1.1.1. 2010-04-21 04:39:45 +00:00
david
dedbb7f6ee Merge commit 43acbb77a8e0b3346b574b3e28793de2d6985e69 from libpcap
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).
2010-04-19 19:22:01 +00:00
fyodor
364ecfca39 Fixed a bug which lead to libpcap ./configure errors on Solaris which
looked like:

./configure: line 6651: syntax error near unexpected token `in'
./configure: line 6651: `       for ac_header in'
configure: error: ./configure failed for libpcap

Example: http://seclists.org/nmap-dev/2010/q1/444

The problem is a bogus empty test in the libpcap/configure.in.  It
was actually fixed by libpcap in SVN back in 2008, but there hasn't
been a release since then :(.  They seem to still be actively developing,
just not making releases.  Sigh.
2010-03-24 05:48:02 +00:00
david
0b1816c0ff Pregenerate lex and yacc files and remove the build dependency on those
programs.
2009-10-27 22:43:09 +00:00
david
9a1ec98da3 Upgrade libpcap to version 1.0.0. 2009-10-27 19:33:50 +00:00