|
 |
9b1536 |
From d8aade59b5787f5d3517fededcd684fe85367afa Mon Sep 17 00:00:00 2001
|
|
|
9b1536 |
From: rpm-build <rpm-build>
|
|
|
9b1536 |
Date: Mon, 29 May 2017 11:54:43 +0200
|
|
|
9b1536 |
Subject: [PATCH] Backport patch to bound tpacketv2 to 64k
|
|
|
9b1536 |
|
|
|
9b1536 |
---
|
|
|
9b1536 |
pcap-linux.c | 29 ++++++++++++++++++-----------
|
|
|
9b1536 |
1 file changed, 18 insertions(+), 11 deletions(-)
|
|
|
9b1536 |
|
|
|
9b1536 |
diff --git a/pcap-linux.c b/pcap-linux.c
|
|
|
9b1536 |
index f7f2aae..d7149d5 100644
|
|
|
9b1536 |
--- a/pcap-linux.c
|
|
|
9b1536 |
+++ b/pcap-linux.c
|
|
|
9b1536 |
@@ -3600,6 +3600,8 @@ prepare_tpacket_socket(pcap_t *handle)
|
|
|
9b1536 |
return 1;
|
|
|
9b1536 |
}
|
|
|
9b1536 |
|
|
|
9b1536 |
+#define MAX(a,b) ((a)>(b)?(a):(b))
|
|
|
9b1536 |
+
|
|
|
9b1536 |
/*
|
|
|
9b1536 |
* Attempt to set up memory-mapped access.
|
|
|
9b1536 |
*
|
|
|
9b1536 |
@@ -3674,25 +3676,30 @@ create_ring(pcap_t *handle, int *status)
|
|
|
9b1536 |
* "packets" bigger than the MTU. */
|
|
|
9b1536 |
frame_size = handle->snapshot;
|
|
|
9b1536 |
if (handle->linktype == DLT_EN10MB) {
|
|
|
9b1536 |
+ unsigned int max_frame_len;
|
|
|
9b1536 |
int mtu;
|
|
|
9b1536 |
int offload;
|
|
|
9b1536 |
|
|
|
9b1536 |
+ mtu = iface_get_mtu(handle->fd, handle->opt.source,
|
|
|
9b1536 |
+ handle->errbuf);
|
|
|
9b1536 |
+ if (mtu == -1) {
|
|
|
9b1536 |
+ *status = PCAP_ERROR;
|
|
|
9b1536 |
+ return -1;
|
|
|
9b1536 |
+ }
|
|
|
9b1536 |
offload = iface_get_offload(handle);
|
|
|
9b1536 |
if (offload == -1) {
|
|
|
9b1536 |
*status = PCAP_ERROR;
|
|
|
9b1536 |
return -1;
|
|
|
9b1536 |
}
|
|
|
9b1536 |
- if (!offload) {
|
|
|
9b1536 |
- mtu = iface_get_mtu(handle->fd, handle->opt.source,
|
|
|
9b1536 |
- handle->errbuf);
|
|
|
9b1536 |
- if (mtu == -1) {
|
|
|
9b1536 |
- *status = PCAP_ERROR;
|
|
|
9b1536 |
- return -1;
|
|
|
9b1536 |
- }
|
|
|
9b1536 |
- if (frame_size > mtu + 18)
|
|
|
9b1536 |
- frame_size = mtu + 18;
|
|
|
9b1536 |
- }
|
|
|
9b1536 |
- }
|
|
|
9b1536 |
+ if (offload)
|
|
|
9b1536 |
+ max_frame_len = MAX(mtu, 65535);
|
|
|
9b1536 |
+ else
|
|
|
9b1536 |
+ max_frame_len = mtu;
|
|
|
9b1536 |
+ max_frame_len += 18;
|
|
|
9b1536 |
+
|
|
|
9b1536 |
+ if (frame_size > max_frame_len)
|
|
|
9b1536 |
+ frame_size = max_frame_len;
|
|
|
9b1536 |
+ }
|
|
|
9b1536 |
|
|
|
9b1536 |
/* NOTE: calculus matching those in tpacket_rcv()
|
|
|
9b1536 |
* in linux-2.6/net/packet/af_packet.c
|
|
|
9b1536 |
--
|
|
|
9b1536 |
2.13.0
|
|
|
9b1536 |
|