From: Victor Julien <victor@inliniac.net>
Date: Mon, 16 Dec 2013 14:56:49 +0000 (+0100)
Subject: Add --disable-detection commandline option
X-Git-Tag: suricata-2.0rc1~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b44ec80590fc5502e734ca22a070d7683c4f1ab8;p=thirdparty%2Fsuricata.git

Add --disable-detection commandline option

Flags the SuriInstance that the detection engine should be disabled.
Actual disabling is not yet implemented.
---

diff --git a/src/suricata.c b/src/suricata.c
index 221653d486..3835586b4b 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -515,6 +515,7 @@ void usage(const char *progname)
            "\t                                       can be printed\n");
     printf("\t--pidfile <file>                     : write pid to this file (only for daemon mode)\n");
     printf("\t--init-errors-fatal                  : enable fatal failure on signature init error\n");
+    printf("\t--disable-detection                  : disable detection engine\n");
     printf("\t--dump-config                        : show the running configuration\n");
     printf("\t--build-info                         : display build information\n");
     printf("\t--pcap[=<dev>]                       : run in pcap mode, no value select interfaces from suricata.yaml\n");
@@ -922,6 +923,7 @@ static void SCInstanceInit(SCInstance *suri)
     suri->verbose = 0;
     /* use -1 as unknown */
     suri->checksum_validation = -1;
+    suri->disabled_detect = 0;
 }
 
 static TmEcode PrintVersion()
@@ -1012,6 +1014,7 @@ static TmEcode ParseCommandLine(int argc, char** argv, SCInstance *suri)
 #endif /* OS_WIN32 */
         {"pidfile", required_argument, 0, 0},
         {"init-errors-fatal", 0, 0, 0},
+        {"disable-detection", 0, 0, 0},
         {"fatal-unittests", 0, 0, 0},
         {"unittests-coverage", 0, &coverage_unittests, 1},
         {"user", required_argument, 0, 0},
@@ -1204,6 +1207,10 @@ static TmEcode ParseCommandLine(int argc, char** argv, SCInstance *suri)
             else if(strcmp((long_opts[option_index]).name, "pidfile") == 0) {
                 suri->pid_filename = optarg;
             }
+            else if(strcmp((long_opts[option_index]).name, "disable-detection") == 0) {
+                suri->disabled_detect = 1;
+                SCLogInfo("detection engine disabled");
+            }
             else if(strcmp((long_opts[option_index]).name, "fatal-unittests") == 0) {
 #ifdef UNITTESTS
                 if (ConfSetFinal("unittests.failure-fatal", "1") != 1) {
diff --git a/src/suricata.h b/src/suricata.h
index fa131acdce..c182aedc61 100644
--- a/src/suricata.h
+++ b/src/suricata.h
@@ -152,6 +152,7 @@ typedef struct SCInstance_ {
 #endif /* OS_WIN32 */
     int delayed_detect;
     int rule_reload;
+    int disabled_detect;
     int daemon;
     int offline;
     int verbose;