|
 |
c401cc |
From c0b8cd530233a9b6bfdf6a46525d44c415b399a7 Mon Sep 17 00:00:00 2001
|
|
|
c401cc |
Message-Id: <c0b8cd530233a9b6bfdf6a46525d44c415b399a7@dist-git>
|
|
|
c401cc |
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
|
|
|
c401cc |
Date: Thu, 20 Mar 2014 00:06:17 -0600
|
|
|
c401cc |
Subject: [PATCH] nwfilter: Increase buffer size for libpcap
|
|
|
c401cc |
|
|
|
c401cc |
https://bugzilla.redhat.com/show_bug.cgi?id=1078347
|
|
|
c401cc |
|
|
|
c401cc |
Libpcap 1.5 requires a larger buffer than previous pcap versions.
|
|
|
c401cc |
Adjust the size of the buffer to 128kb.
|
|
|
c401cc |
|
|
|
c401cc |
This patch should address symptoms in BZ 1071181 and BZ 731059
|
|
|
c401cc |
|
|
|
c401cc |
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
|
|
|
c401cc |
|
|
|
c401cc |
(cherry picked from commit 49b59a151f60b0a178b023b727bac30f80bd6000)
|
|
|
c401cc |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c401cc |
---
|
|
|
c401cc |
src/nwfilter/nwfilter_dhcpsnoop.c | 6 +++++-
|
|
|
c401cc |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
c401cc |
|
|
|
c401cc |
diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
|
|
|
c401cc |
index 2bc1686..0b0eb47 100644
|
|
|
c401cc |
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
|
|
|
c401cc |
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
|
|
|
c401cc |
@@ -250,7 +250,11 @@ struct _virNWFilterDHCPDecodeJob {
|
|
|
c401cc |
# define DHCP_PKT_BURST 50 /* pkts/sec */
|
|
|
c401cc |
# define DHCP_BURST_INTERVAL_S 10 /* sec */
|
|
|
c401cc |
|
|
|
c401cc |
-# define PCAP_BUFFERSIZE (DHCP_PKT_BURST * PCAP_PBUFSIZE / 2)
|
|
|
c401cc |
+/*
|
|
|
c401cc |
+ * libpcap 1.5 requires a 128kb buffer
|
|
|
c401cc |
+ * 128 kb is bigger than (DHCP_PKT_BURST * PCAP_PBUFSIZE / 2)
|
|
|
c401cc |
+ */
|
|
|
c401cc |
+# define PCAP_BUFFERSIZE (128 * 1024)
|
|
|
c401cc |
|
|
|
c401cc |
# define MAX_QUEUED_JOBS (DHCP_PKT_BURST + 2 * DHCP_PKT_RATE)
|
|
|
c401cc |
|
|
|
c401cc |
--
|
|
|
c401cc |
1.9.1
|
|
|
c401cc |
|