afpacket: disable tpacket-v3 by default

It's still considered experimental at this point.

diff --git a/src/runmode-af-packet.c b/src/runmode-af-packet.c
index f485f5b23c2f3b28fac91865236d671e4aae4c9b..1696834c12bc166be518352330bac7028a396fa3 100644 (file)
--- a/src/runmode-af-packet.c
+++ b/src/runmode-af-packet.c
@@ -142,7 +142,7 @@ void *ParseAFPConfig(const char *iface)
     aconf->promisc = 1;
     aconf->checksum_mode = CHECKSUM_VALIDATION_KERNEL;
     aconf->DerefFunc = AFPDerefConfig;
-    aconf->flags = AFP_RING_MODE|AFP_TPACKET_V3;
+    aconf->flags = AFP_RING_MODE;
     aconf->bpf_filter = NULL;
     aconf->out_iface = NULL;
     aconf->copy_mode = AFP_COPY_MODE_NONE;
@@ -199,15 +199,11 @@ void *ParseAFPConfig(const char *iface)
     }
 
     if (ConfGetChildValueBoolWithDefault(if_root, if_default, "use-mmap", (int *)&boolval) == 1) {
-        if (boolval) {
-            aconf->flags |= AFP_RING_MODE;
-        } else {
+        if (!boolval) {
             SCLogConfig("Disabling mmaped capture on iface %s",
                     aconf->iface);
-            aconf->flags &= ~AFP_RING_MODE;
+            aconf->flags &= ~(AFP_RING_MODE|AFP_TPACKET_V3);
         }
-    } else {
-        aconf->flags |= AFP_RING_MODE;
     }
 
     if (aconf->flags & AFP_RING_MODE) {
@@ -218,25 +214,31 @@ void *ParseAFPConfig(const char *iface)
                     aconf->iface);
             aconf->flags |= AFP_MMAP_LOCKED;
         }
-        (void)ConfGetChildValueBoolWithDefault(if_root, if_default,
-                                               "tpacket-v3", (int *)&boolval);
-        if (boolval) {
-            if (strcasecmp(RunmodeGetActive(), "workers") == 0) {
+
+        if (ConfGetChildValueBoolWithDefault(if_root, if_default,
+                                             "tpacket-v3", (int *)&boolval) == 1)
+        {
+            if (boolval) {
+                if (strcasecmp(RunmodeGetActive(), "workers") == 0) {
 #ifdef HAVE_TPACKET_V3
-                SCLogConfig("Enabling tpacket v3 capture on iface %s",
-                        aconf->iface);
-                aconf->flags |= AFP_TPACKET_V3;
+                    SCLogConfig("Enabling tpacket v3 capture on iface %s",
+                            aconf->iface);
+                    aconf->flags |= AFP_TPACKET_V3;
 #else
-                SCLogNotice("System too old for tpacket v3 switching to v2");
-                aconf->flags &= ~AFP_TPACKET_V3;
+                    SCLogNotice("System too old for tpacket v3 switching to v2");
+                    aconf->flags &= ~AFP_TPACKET_V3;
 #endif
+                } else {
+                    SCLogWarning(SC_ERR_RUNMODE,
+                            "tpacket v3 is only implemented for 'workers' runmode."
+                            " Switching to tpacket v2.");
+                    aconf->flags &= ~AFP_TPACKET_V3;
+                }
             } else {
-                SCLogError(SC_ERR_RUNMODE,
-                        "tpacket v3 is only implemented for 'workers' runmode."
-                        " Switching to tpacket v2.");
                 aconf->flags &= ~AFP_TPACKET_V3;
             }
         }
+
         (void)ConfGetChildValueBoolWithDefault(if_root, if_default,
                                                "use-emergency-flush", (int *)&boolval);
         if (boolval) {

diff --git a/suricata.yaml.in b/suricata.yaml.in
index c0912cddeebc018d112b9368f9f61cc1f3b2930a..5d87be99026cb61741b3ced75d8bb7d123165814 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -514,8 +514,8 @@ af-packet:
     # Lock memory map to avoid it goes to swap. Be careful that over suscribing could lock
     # your system
     #mmap-locked: yes
-    # Use tpacket_v3, capture mode, only active if user-mmap is true
-    tpacket-v3: yes
+    # Use experimental tpacket_v3 capture mode, only active if use-mmap is true
+    #tpacket-v3: yes
     # Ring size will be computed with respect to max_pending_packets and number
     # of threads. You can set manually the ring size in number of packets by setting
     # the following value. If you are using flow cluster-type and have really network
@@ -563,7 +563,7 @@ af-packet:
     #threads: auto
     #use-mmap: no
     #rollover: yes
-    tpacket-v3: yes
+    #tpacket-v3: yes
 
 # Cross platform libpcap capture support
 pcap: