Pull request #4572: mercury: telemetry file changes for multiprocess snort

Merge in SNORT/snort3 from ~PJASEJA/snort3:mercury_telemetry_files to master

Squashed commit of the following:

commit 1f8f3ba43e12e9e153fb72df119d47ebe8c78096
Author: Priyansh Jaseja <pjaseja@b18-vms-vm0114.cisco.com>
Date:   Thu Jan 23 11:17:01 2025 +0530

    mercury: telemetry file changes for multiprocess snort

diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 94c06f1f8a06310315b7ab5e24fcae0b3cc3e937..46829581ffd86d703c3fd83d4dacc3cb1503da2e 100644 (file)
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -8,6 +8,7 @@ set (INCLUDES
     snort_types.h
     thread.h
     thread_config.h
+    snort.h
 )
 
 set (LOCAL_INCLUDES

diff --git a/src/main/snort.h b/src/main/snort.h
index 375c30fb5762aa5d969c951a0ebb31e7bc8c82e9..d8b66ce9fbe3e7bb61f548164b5acab42d44dced 100644 (file)
--- a/src/main/snort.h
+++ b/src/main/snort.h
@@ -24,6 +24,9 @@
 // Snort is the top-level application class.
 #include <daq_common.h>
 
+#include "snort_types.h"
+
+
 class ContextSwitcher;
 
 namespace snort
@@ -48,7 +51,7 @@ public:
     static bool is_exiting() { return already_exiting; }
     static bool is_reloading();
 
-    static unsigned get_process_id();
+    SO_PUBLIC static unsigned get_process_id();
 
 private:
     static void init(int, char**);