test mode: parse interface list in test mode

diff --git a/src/suricata.c b/src/suricata.c
index a69a8a44d34eedf65b69e3fb5709e5945c9234d0..e22e0a9cef06161fdd0e2dbf1e553856335be3bb 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -945,7 +945,7 @@ static TmEcode LoadYamlConfig(SCInstance *suri)
     SCReturnInt(TM_ECODE_OK);
 }
 
-static TmEcode ParseInterfacesList(int runmode, char *pcap_dev)
+static TmEcode ParseInterfacesList(const int runmode, char *pcap_dev)
 {
     SCEnter();
 
@@ -2128,6 +2128,9 @@ static TmEcode ParseCommandLine(int argc, char** argv, SCInstance *suri)
         return TM_ECODE_FAILED;
     }
 
+    /* save the runmode from the commandline (if any) */
+    suri->aux_run_mode = suri->run_mode;
+
     if (list_app_layer_protocols)
         suri->run_mode = RUNMODE_LIST_APP_LAYERS;
     if (list_keywords)
@@ -2976,7 +2979,7 @@ int main(int argc, char **argv)
     LogVersion();
     UtilCpuPrintSummary();
 
-    if (ParseInterfacesList(suricata.run_mode, suricata.pcap_dev) != TM_ECODE_OK) {
+    if (ParseInterfacesList(suricata.aux_run_mode, suricata.pcap_dev) != TM_ECODE_OK) {
         exit(EXIT_FAILURE);
     }
 

diff --git a/src/suricata.h b/src/suricata.h
index 99e48aacadfae19c7c697bba63a9eb3c5e766665..33ce1678a53cb8a55a4c5301358c921ad4af8913 100644 (file)
--- a/src/suricata.h
+++ b/src/suricata.h
@@ -132,6 +132,7 @@ PacketQueue trans_q[256];
 
 typedef struct SCInstance_ {
     enum RunModes run_mode;
+    enum RunModes aux_run_mode;
 
     char pcap_dev[128];
     char *sig_file;