From 43dee9a5ef6e1ae3fe594f6d78951f3b17748aa5 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Wed, 24 May 2017 21:30:48 +0200
Subject: [PATCH] unix socket: improve output of unix mode

---
 src/runmode-unix-socket.c | 13 +++++++++----
 src/suricata.c            |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/runmode-unix-socket.c b/src/runmode-unix-socket.c
index fa3bc8eabf..b704df3884 100644
--- a/src/runmode-unix-socket.c
+++ b/src/runmode-unix-socket.c
@@ -66,7 +66,7 @@ const char *RunModeUnixSocketGetDefaultMode(void)
 
 #ifdef BUILD_UNIX_SOCKET
 
-static int RunModeUnixSocketSingle(void);
+static int RunModeUnixSocketMaster(void);
 static int unix_manager_file_task_running = 0;
 static int unix_manager_file_task_failed = 0;
 
@@ -350,6 +350,7 @@ TmEcode UnixSocketPcapFilesCheck(void *data)
     RunModeDispatch(RUNMODE_PCAP_FILE, NULL);
 
     /* Un-pause all the paused threads */
+    TmThreadWaitOnThreadInit();
     TmThreadContinueThreads();
     return TM_ECODE_OK;
 }
@@ -358,10 +359,14 @@ TmEcode UnixSocketPcapFilesCheck(void *data)
 void RunModeUnixSocketRegister(void)
 {
 #ifdef BUILD_UNIX_SOCKET
+    /* a bit of a hack, but register twice to --list-runmodes shows both */
     RunModeRegisterNewRunMode(RUNMODE_UNIX_SOCKET, "single",
                               "Unix socket mode",
-                              RunModeUnixSocketSingle);
-    default_mode = "single";
+                              RunModeUnixSocketMaster);
+    RunModeRegisterNewRunMode(RUNMODE_UNIX_SOCKET, "autofp",
+                              "Unix socket mode",
+                              RunModeUnixSocketMaster);
+    default_mode = "autofp";
 #endif
     return;
 }
@@ -758,7 +763,7 @@ TmEcode UnixSocketUnregisterTenant(json_t *cmd, json_t* answer, void *data)
 /**
  * \brief Single thread version of the Pcap file processing.
  */
-static int RunModeUnixSocketSingle(void)
+static int RunModeUnixSocketMaster(void)
 {
     if (UnixManagerInit() != 0)
         return 1;
diff --git a/src/suricata.c b/src/suricata.c
index 40ac45709d..a8bab29f1d 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2576,6 +2576,10 @@ static int PostConfLoadedSetup(SCInstance *suri)
             break;
     }
 
+    if (suri->runmode_custom_mode) {
+        ConfSet("runmode", suri->runmode_custom_mode);
+    }
+
     AppLayerSetup();
 
     /* Check for the existance of the default logging directory which we pick
-- 
2.47.2