summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2013-12-16 15:03:03 (GMT)
committer Peter Korsgaard <peter@korsgaard.com>2013-12-16 15:03:03 (GMT)
commit7f05f73e44d8be72aacb53d279585281b639058f (patch)
tree3d9abd2b108eb7095a5dd20e9aa8a6976707abcb
parent9e8015d4651a77a40a9ffe48051e53baecc20ced (diff)
downloadbuildroot-7f05f73e44d8be72aacb53d279585281b639058f.tar.gz
buildroot-7f05f73e44d8be72aacb53d279585281b639058f.tar.bz2
libpcap: add upstream patch to fix runtime issue when TPACKET_V3 isn't supported
libpcap would fail to initialize on Linux when compiled against kernel headers with TPACKET_V3 support but running on kernel without: "can't get TPACKET_V3 header len on packet socket: Invalid argument" Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libpcap/libpcap-0001-remove-libnl-include-path.patch (renamed from package/libpcap/libpcap-remove-libnl-include-path.patch)0
-rw-r--r--package/libpcap/libpcap-0002-fix-TPACKET_V3-initialization-GH-329.patch34
2 files changed, 34 insertions, 0 deletions
diff --git a/package/libpcap/libpcap-remove-libnl-include-path.patch b/package/libpcap/libpcap-0001-remove-libnl-include-path.patch
index 7b7106b..7b7106b 100644
--- a/package/libpcap/libpcap-remove-libnl-include-path.patch
+++ b/package/libpcap/libpcap-0001-remove-libnl-include-path.patch
diff --git a/package/libpcap/libpcap-0002-fix-TPACKET_V3-initialization-GH-329.patch b/package/libpcap/libpcap-0002-fix-TPACKET_V3-initialization-GH-329.patch
new file mode 100644
index 0000000..9d16098
--- /dev/null
+++ b/package/libpcap/libpcap-0002-fix-TPACKET_V3-initialization-GH-329.patch
@@ -0,0 +1,34 @@
+From cd84bc9743d7595dee1ea4bc40bd236a619d6539 Mon Sep 17 00:00:00 2001
+From: Gabor Tatarka <gabor.tatarka@ericsson.com>
+Date: Mon, 2 Dec 2013 22:05:57 +0400
+Subject: [PATCH] fix TPACKET_V3 initialization (GH #329)
+
+libpcap would fail to initialize on Linux when compiled against kernel
+headers with TPACKET_V3 support but running on kernel without:
+
+"can't get TPACKET_V3 header len on packet socket: Invalid argument"
+
+Fix init_tpacket() to respect EINVAL because that is what the kernel
+returns for unsupported TPACKET versions.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ pcap-linux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pcap-linux.c b/pcap-linux.c
+index 6c0723a..8800c96 100644
+--- a/pcap-linux.c
++++ b/pcap-linux.c
+@@ -3471,7 +3471,7 @@ init_tpacket(pcap_t *handle, int version, const char *version_str)
+
+ /* Probe whether kernel supports the specified TPACKET version */
+ if (getsockopt(handle->fd, SOL_PACKET, PACKET_HDRLEN, &val, &len) < 0) {
+- if (errno == ENOPROTOOPT)
++ if (errno == ENOPROTOOPT || errno == EINVAL)
+ return 1; /* no */
+
+ /* Failed to even find out; this is a fatal error. */
+--
+1.8.5.1
+