Add function to display current capture mode

This patch adds a function to display the capture mode.

diff --git a/src/runmodes.c b/src/runmodes.c
index 918a20e02074d67fbecde5b4d1865287dd7d9143..3f0380075298960386979b59e2ef35b5d3d40568 100644 (file)
--- a/src/runmodes.c
+++ b/src/runmodes.c
@@ -162,6 +162,20 @@ char *RunmodeGetActive(void)
     return active_runmode;
 }
 
+/**
+ * Return the running mode
+ *
+ * The returned string must not be freed.
+ *
+ * \return a string containing the current running mode
+ */
+const char *RunModeGetMainMode(void)
+{
+    int mainmode = RunmodeGetCurrent();
+
+    return RunModeTranslateModeToName(mainmode);
+}
+
 /**
  * \brief Register all runmodes in the engine.
  */

diff --git a/src/runmodes.h b/src/runmodes.h
index 0e4a9e9859b9a3844bf8e6a9af243bc129688c5f..9687ea008393f0d85c5be988bfd587b4c13a21aa 100644 (file)
--- a/src/runmodes.h
+++ b/src/runmodes.h
@@ -41,6 +41,7 @@ enum {
 };
 
 char *RunmodeGetActive(void);
+const char *RunModeGetMainMode(void);
 
 void RunModeListRunmodes(void);
 void RunModeDispatch(int, const char *, DetectEngineCtx *);

diff --git a/src/suricata.c b/src/suricata.c
index 660d278886ff374b67d95f49e85c3bd324c762df..c5c0c36faf95fe6f41b766a9bf98248b10019d3c 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -242,6 +242,11 @@ int RunmodeIsUnittests(void) {
     return 0;
 }
 
+int RunmodeGetCurrent(void)
+{
+    return run_mode;
+}
+
 static void SignalHandlerSigint(/*@unused@*/ int sig) {
     sigint_count = 1;
     suricata_ctl_flags |= SURICATA_STOP;

diff --git a/src/suricata.h b/src/suricata.h
index a75fb03be3f7748d24d7aba4580ec8140a47fb72..6b702181c9054a880086699bed6ab24e846e4aac 100644 (file)
--- a/src/suricata.h
+++ b/src/suricata.h
@@ -151,6 +151,7 @@ void SignalHandlerSigusr2EngineShutdown(int);
 void SignalHandlerSigusr2Idle(int sig);
 
 int RunmodeIsUnittests(void);
+int RunmodeGetCurrent(void);
 
 extern int run_mode;