From: Victor Julien <victor@inliniac.net>
Date: Tue, 12 Apr 2016 10:30:20 +0000 (+0200)
Subject: capture: only check for faster methods on -i
X-Git-Tag: suricata-3.1RC1~249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2006%2Fhead;p=thirdparty%2Fsuricata.git

capture: only check for faster methods on -i

Also, since we now default to AF_PACKET for -i if available, only check
for PF_RING and NETMAP.
---

diff --git a/src/suricata.c b/src/suricata.c
index 9ca72a4ba6..85a7a51637 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -1149,44 +1149,6 @@ static int ParseCommandLinePcapLive(SCInstance *suri, const char *optarg)
     memset(suri->pcap_dev, 0, sizeof(suri->pcap_dev));
 
     if (optarg != NULL) {
-        /* warn user if af-packet, netmap or pf-ring are available */
-#if defined HAVE_AF_PACKET || HAVE_PFRING || HAVE_NETMAP
-        int i = 0;
-#ifdef HAVE_AF_PACKET
-        i++;
-#endif
-#ifdef HAVE_PFRING
-        i++;
-#endif
-#ifdef HAVE_NETMAP
-        i++;
-#endif
-        SCLogWarning(SC_WARN_FASTER_CAPTURE_AVAILABLE, "faster capture "
-                "option%s %s available:"
-#ifdef HAVE_AF_PACKET
-                " AF_PACKET (--af-packet=%s)"
-#endif
-#ifdef HAVE_PFRING
-                " PF_RING (--pfring-int=%s)"
-#endif
-#ifdef HAVE_NETMAP
-                " NETMAP (--netmap=%s)"
-#endif
-                ". Use --pcap=%s to suppress this warning",
-                i == 1 ? "" : "s", i == 1 ? "is" : "are"
-
-#ifdef HAVE_AF_PACKET
-                , optarg
-#endif
-#ifdef HAVE_PFRING
-                , optarg
-#endif
-#ifdef HAVE_NETMAP
-                , optarg
-#endif
-                , optarg
-                );
-#endif
         /* some windows shells require escaping of the \ in \Device. Otherwise
          * the backslashes are stripped. We put them back here. */
         if (strlen(optarg) > 9 && strncmp(optarg, "DeviceNPF", 9) == 0) {
@@ -1745,7 +1707,35 @@ static TmEcode ParseCommandLine(int argc, char** argv, SCInstance *suri)
             if (ParseCommandLineAfpacket(suri, optarg) != TM_ECODE_OK) {
                 return TM_ECODE_FAILED;
             }
-#else
+#else /* not afpacket */
+            /* warn user if netmap or pf-ring are available */
+#if defined HAVE_PFRING || HAVE_NETMAP
+            int i = 0;
+#ifdef HAVE_PFRING
+            i++;
+#endif
+#ifdef HAVE_NETMAP
+            i++;
+#endif
+            SCLogWarning(SC_WARN_FASTER_CAPTURE_AVAILABLE, "faster capture "
+                    "option%s %s available:"
+#ifdef HAVE_PFRING
+                    " PF_RING (--pfring-int=%s)"
+#endif
+#ifdef HAVE_NETMAP
+                    " NETMAP (--netmap=%s)"
+#endif
+                    ". Use --pcap=%s to suppress this warning",
+                    i == 1 ? "" : "s", i == 1 ? "is" : "are"
+#ifdef HAVE_PFRING
+                    , optarg
+#endif
+#ifdef HAVE_NETMAP
+                    , optarg
+#endif
+                    , optarg
+                    );
+#endif /* have faster methods */
             if (ParseCommandLinePcapLive(suri, optarg) != TM_ECODE_OK) {
                 return TM_ECODE_FAILED;
             }