1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 04:31:29 +00:00

Add previous commit to libpcap/NMAP_MODIFICATIONS/

This commit is contained in:
dmiller
2015-09-15 13:31:21 +00:00
parent 83b9c4c939
commit c86bf7bfa0
2 changed files with 31 additions and 0 deletions

View File

@@ -1,5 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*-
o Disable TPACKET_V3 in our included libpcap. This version of the Linux kernel
packet ring API has problems that result in lots of lost packets. This patch
falls back to TPACKET_V2 or earlier versions if available. [nnposter]
o Output a warning when deprecated options are used, and suggest the preferred
option. Currently deprecated: -i -o -m -sP -P0 -PN -oM -sR. The warning is
only visible with -v. [Daniel Miller]

View File

@@ -0,0 +1,27 @@
From 4523e52bb5c54f4d65cd3672e8f875c137b44f77 Mon Sep 17 00:00:00 2001
From: Daniel Miller <daniel@bonsaiviking.com>
Date: Tue, 15 Sep 2015 13:16:39 +0000
Subject: [PATCH] Disable TPACKET_V3 in included libpcap. Still broken, see #34
---
libpcap/pcap-linux.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libpcap/pcap-linux.c b/libpcap/pcap-linux.c
index a226da1..a17c250 100644
--- a/libpcap/pcap-linux.c
+++ b/libpcap/pcap-linux.c
@@ -188,6 +188,10 @@
# endif /* PACKET_HOST */
+ /* TPACKET_V3 is broken. Temporarily disabling support here until upstream
+ * libpcap addresses the issue. */
+#undef TPACKET3_HDRLEN
+
/* check for memory mapped access avaibility. We assume every needed
* struct is defined if the macro TPACKET_HDRLEN is defined, because it
* uses many ring related structs and macros */
--
1.9.1