suricata checkin based on commit id a4bce14770beee46a537eda3c3f6e8e8565d5d0a

Change-Id: I9a214fa0ee95e58fc640e50bd604dac7f42db48f

1 files changed, 150 insertions, 0 deletions

diff --git a/framework/src/suricata/src/runmode-erf-dag.c b/framework/src/suricata/src/runmode-erf-dag.c
new file mode 100644
index 00000000..5653b9ec
--- /dev/null
+++ b/framework/src/suricata/src/runmode-erf-dag.c
@@ -0,0 +1,150 @@
+/* Copyright (C) 2007-2010 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "suricata-common.h"
+#include "tm-threads.h"
+#include "conf.h"
+#include "runmodes.h"
+#include "runmode-erf-dag.h"
+#include "output.h"
+
+#include "detect-engine.h"
+
+#include "util-debug.h"
+#include "util-time.h"
+#include "util-cpu.h"
+#include "util-affinity.h"
+#include "util-runmodes.h"
+
+static const char *default_mode;
+
+static int DagConfigGetThreadCount(void *conf)
+{
+    return 1;
+}
+
+static void *ParseDagConfig(const char *iface)
+{
+    return (void *)iface;
+}
+
+const char *RunModeErfDagGetDefaultMode(void)
+{
+    return default_mode;
+}
+
+void RunModeErfDagRegister(void)
+{
+    default_mode = "autofp";
+
+    RunModeRegisterNewRunMode(RUNMODE_DAG, "autofp",
+        "Multi threaded DAG mode.  Packets from "
+        "each flow are assigned to a single detect "
+        "thread, unlike \"dag_auto\" where packets "
+        "from the same flow can be processed by any "
+        "detect thread",
+        RunModeIdsErfDagAutoFp);
+
+    RunModeRegisterNewRunMode(RUNMODE_DAG, "single",
+        "Singled threaded DAG mode",
+        RunModeIdsErfDagSingle);
+
+    RunModeRegisterNewRunMode(RUNMODE_DAG, "workers",
+        "Workers DAG mode, each thread does all "
+        " tasks from acquisition to logging",
+        RunModeIdsErfDagWorkers);
+
+    return;
+}
+
+int RunModeIdsErfDagSingle(void)
+{
+    int ret;
+
+    SCEnter();
+
+    RunModeInitialize();
+
+    TimeModeSetLive();
+
+    ret = RunModeSetLiveCaptureSingle(ParseDagConfig,
+        DagConfigGetThreadCount,
+        "ReceiveErfDag",
+        "DecodeErfDag",
+        "RxDAG",
+        NULL);
+    if (ret != 0) {
+        SCLogError(SC_ERR_RUNMODE, "DAG single runmode failed to start");
+        exit(EXIT_FAILURE);
+    }
+
+    SCLogInfo("RunModeIdsDagSingle initialised");
+
+    SCReturnInt(0);
+}
+
+int RunModeIdsErfDagAutoFp(void)
+{
+    int ret;
+
+    SCEnter();
+
+    RunModeInitialize();
+
+    TimeModeSetLive();
+
+    ret = RunModeSetLiveCaptureAutoFp(ParseDagConfig,
+        DagConfigGetThreadCount,
+        "ReceiveErfDag",
+        "DecodeErfDag",
+        "RxDAG",
+        NULL);
+    if (ret != 0) {
+        SCLogError(SC_ERR_RUNMODE, "DAG autofp runmode failed to start");
+        exit(EXIT_FAILURE);
+    }
+
+    SCLogInfo("RunModeIdsDagAutoFp initialised");
+
+    SCReturnInt(0);
+}
+
+int RunModeIdsErfDagWorkers(void)
+{
+    int ret;
+
+    SCEnter();
+
+    RunModeInitialize();
+
+    TimeModeSetLive();
+
+    ret = RunModeSetLiveCaptureWorkers(ParseDagConfig,
+        DagConfigGetThreadCount,
+        "ReceiveErfDag",
+        "DecodeErfDag",
+        "RxDAG",
+        NULL);
+    if (ret != 0) {
+        SCLogError(SC_ERR_RUNMODE, "DAG workers runmode failed to start");
+        exit(EXIT_FAILURE);
+    }
+
+    SCLogInfo("RunModeIdsErfDagWorkers initialised");
+
+    SCReturnInt(0);
+}