From: Victor Julien <victor@inliniac.net>
Date: Tue, 9 Jul 2019 11:20:44 +0000 (+0200)
Subject: runmodes: simply default runmode logic
X-Git-Tag: suricata-5.0.0-rc1~213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c6251ea6c71418f65e28db885cbeca3f8055cfc;p=thirdparty%2Fsuricata.git

runmodes: simply default runmode logic
---

diff --git a/src/runmode-af-packet.c b/src/runmode-af-packet.c
index 480c833f3b..4e6400b9f5 100644
--- a/src/runmode-af-packet.c
+++ b/src/runmode-af-packet.c
@@ -60,11 +60,9 @@
 
 extern int max_pending_packets;
 
-static const char *default_mode_workers = NULL;
-
 const char *RunModeAFPGetDefaultMode(void)
 {
-    return default_mode_workers;
+    return "workers";
 }
 
 void RunModeIdsAFPRegister(void)
@@ -76,7 +74,6 @@ void RunModeIdsAFPRegister(void)
                               "Workers af-packet mode, each thread does all"
                               " tasks from acquisition to logging",
                               RunModeIdsAFPWorkers);
-    default_mode_workers = "workers";
     RunModeRegisterNewRunMode(RUNMODE_AFP_DEV, "autofp",
                               "Multi socket AF_PACKET mode.  Packets from "
                               "each flow are assigned to a single detect "
diff --git a/src/runmode-erf-dag.c b/src/runmode-erf-dag.c
index a27544f22f..f19709abb6 100644
--- a/src/runmode-erf-dag.c
+++ b/src/runmode-erf-dag.c
@@ -30,8 +30,6 @@
 #include "util-affinity.h"
 #include "util-runmodes.h"
 
-static const char *default_mode;
-
 static int DagConfigGetThreadCount(void *conf)
 {
     return 1;
@@ -44,13 +42,11 @@ static void *ParseDagConfig(const char *iface)
 
 const char *RunModeErfDagGetDefaultMode(void)
 {
-    return default_mode;
+    return "autofp";
 }
 
 void RunModeErfDagRegister(void)
 {
-    default_mode = "autofp";
-
     RunModeRegisterNewRunMode(RUNMODE_DAG, "autofp",
         "Multi threaded DAG mode.  Packets from "
         "each flow are assigned to a single detect "
diff --git a/src/runmode-erf-file.c b/src/runmode-erf-file.c
index 5002030976..b3b97ea277 100644
--- a/src/runmode-erf-file.c
+++ b/src/runmode-erf-file.c
@@ -31,17 +31,13 @@
 
 #include "util-runmodes.h"
 
-static const char *default_mode;
-
 const char *RunModeErfFileGetDefaultMode(void)
 {
-    return default_mode;
+    return "autofp";
 }
 
 void RunModeErfFileRegister(void)
 {
-    default_mode = "autofp";
-
     RunModeRegisterNewRunMode(RUNMODE_ERF_FILE, "single",
         "Single threaded ERF file mode",
         RunModeErfFileSingle);
diff --git a/src/runmode-ipfw.c b/src/runmode-ipfw.c
index 841692e116..88a9187c11 100644
--- a/src/runmode-ipfw.c
+++ b/src/runmode-ipfw.c
@@ -41,17 +41,13 @@
 #include "source-ipfw.h"
 #include "util-device.h"
 
-static const char *default_mode;
-
 const char *RunModeIpsIPFWGetDefaultMode(void)
 {
-    return default_mode;
+    return "autofp";
 }
 
 void RunModeIpsIPFWRegister(void)
 {
-    default_mode = "autofp";
-
     RunModeRegisterNewRunMode(RUNMODE_IPFW, "autofp",
                               "Multi threaded IPFW IPS mode with respect to flow",
                               RunModeIpsIPFWAutoFp);
diff --git a/src/runmode-napatech.c b/src/runmode-napatech.c
index 2400ca4f62..e017e135ce 100644
--- a/src/runmode-napatech.c
+++ b/src/runmode-napatech.c
@@ -40,8 +40,6 @@
 #define NT_RUNMODE_AUTOFP  1
 #define NT_RUNMODE_WORKERS 2
 
-static const char *default_mode = "workers";
-
 #ifdef HAVE_NAPATECH
 
 #define MAX_STREAMS 256
@@ -74,7 +72,7 @@ bool NapatechIsAutoConfigEnabled(void)
 
 const char *RunModeNapatechGetDefaultMode(void)
 {
-    return default_mode;
+    return "workers";
 }
 
 void RunModeNapatechRegister(void)
diff --git a/src/runmode-nflog.c b/src/runmode-nflog.c
index 578eb715d5..569dcd78f7 100644
--- a/src/runmode-nflog.c
+++ b/src/runmode-nflog.c
@@ -34,16 +34,13 @@
 
 #include "source-nflog.h"
 
-static const char *default_mode = NULL;
-
 const char *RunModeIdsNflogGetDefaultMode(void)
 {
-    return default_mode;
+    return "autofp";
 }
 
 void RunModeIdsNflogRegister(void)
 {
-    default_mode = "autofp";
     RunModeRegisterNewRunMode(RUNMODE_NFLOG, "autofp",
                               "Multi threaded nflog mode",
                               RunModeIdsNflogAutoFp);
diff --git a/src/runmode-nfq.c b/src/runmode-nfq.c
index 67fa5bcbe9..f1c6b19410 100644
--- a/src/runmode-nfq.c
+++ b/src/runmode-nfq.c
@@ -39,16 +39,13 @@
 #include "util-runmodes.h"
 #include "util-device.h"
 
-static const char *default_mode;
-
 const char *RunModeIpsNFQGetDefaultMode(void)
 {
-    return default_mode;
+    return "autofp";
 }
 
 void RunModeIpsNFQRegister(void)
 {
-    default_mode = "autofp";
     RunModeRegisterNewRunMode(RUNMODE_NFQ, "autofp",
                               "Multi threaded NFQ IPS mode with respect to flow",
                               RunModeIpsNFQAutoFp);
diff --git a/src/runmode-pcap-file.c b/src/runmode-pcap-file.c
index ae5cb84c71..3de5c98e51 100644
--- a/src/runmode-pcap-file.c
+++ b/src/runmode-pcap-file.c
@@ -32,11 +32,9 @@
 
 #include "util-runmodes.h"
 
-static const char *default_mode = NULL;
-
 const char *RunModeFilePcapGetDefaultMode(void)
 {
-    return default_mode;
+    return "autofp";
 }
 
 void RunModeFilePcapRegister(void)
@@ -44,7 +42,6 @@ void RunModeFilePcapRegister(void)
     RunModeRegisterNewRunMode(RUNMODE_PCAP_FILE, "single",
                               "Single threaded pcap file mode",
                               RunModeFilePcapSingle);
-    default_mode = "autofp";
     RunModeRegisterNewRunMode(RUNMODE_PCAP_FILE, "autofp",
                               "Multi threaded pcap file mode.  Packets from "
                               "each flow are assigned to a single detect thread, "
diff --git a/src/runmode-pcap.c b/src/runmode-pcap.c
index 04325ee383..db22d2f0a1 100644
--- a/src/runmode-pcap.c
+++ b/src/runmode-pcap.c
@@ -32,11 +32,9 @@
 #include "util-atomic.h"
 #include "util-misc.h"
 
-static const char *default_mode = NULL;
-
 const char *RunModeIdsGetDefaultMode(void)
 {
-    return default_mode;
+    return "autofp";
 }
 
 int RunModeIdsPcapWorkers(void);
@@ -46,7 +44,6 @@ void RunModeIdsPcapRegister(void)
     RunModeRegisterNewRunMode(RUNMODE_PCAP_DEV, "single",
                               "Single threaded pcap live mode",
                               RunModeIdsPcapSingle);
-    default_mode = "autofp";
     RunModeRegisterNewRunMode(RUNMODE_PCAP_DEV, "autofp",
                               "Multi threaded pcap live mode.  Packets from "
                               "each flow are assigned to a single detect thread, "
diff --git a/src/runmode-unix-socket.c b/src/runmode-unix-socket.c
index 53bb4cefc7..04257b4408 100644
--- a/src/runmode-unix-socket.c
+++ b/src/runmode-unix-socket.c
@@ -49,8 +49,6 @@
 
 #include "conf-yaml-loader.h"
 
-static const char *default_mode = NULL;
-
 int unix_socket_mode_is_running = 0;
 
 typedef struct PcapFiles_ {
@@ -79,7 +77,7 @@ typedef struct MemcapCommand_ {
 
 const char *RunModeUnixSocketGetDefaultMode(void)
 {
-    return default_mode;
+    return "autofp";
 }
 
 #ifdef BUILD_UNIX_SOCKET
@@ -594,7 +592,6 @@ void RunModeUnixSocketRegister(void)
     RunModeRegisterNewRunMode(RUNMODE_UNIX_SOCKET, "autofp",
                               "Unix socket mode",
                               RunModeUnixSocketMaster);
-    default_mode = "autofp";
 #endif
 }
 
diff --git a/src/runmode-windivert.c b/src/runmode-windivert.c
index adccdb8b7f..6b96da0c11 100644
--- a/src/runmode-windivert.c
+++ b/src/runmode-windivert.c
@@ -37,16 +37,13 @@
 #include "util-runmodes.h"
 #include "util-time.h"
 
-
-static const char *default_mode;
-
-
-const char *RunModeIpsWinDivertGetDefaultMode(void) { return default_mode; }
+const char *RunModeIpsWinDivertGetDefaultMode(void)
+{
+    return "autofp";
+}
 
 void RunModeIpsWinDivertRegister(void)
 {
-    default_mode = "autofp";
-
     RunModeRegisterNewRunMode(
             RUNMODE_WINDIVERT, "autofp",
             "Multi-threaded WinDivert IPS mode load-balanced by flow",