From: Shanmugam S (shanms) <shanms@cisco.com>
Date: Wed, 24 Aug 2022 05:04:19 +0000 (+0000)
Subject: Pull request #3549: crashhandler: Crashandler signal handling path Fix
X-Git-Tag: 3.1.40.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b677037696a7d2e2b20d1ca9ad2fdf8a9b3a0db;p=thirdparty%2Fsnort3.git

Pull request #3549: crashhandler: Crashandler signal handling path Fix

Merge in SNORT/snort3 from ~MSONEJA/snort3:crash_handler_fix to master

Squashed commit of the following:

commit c880afa890d8b451968f1dd7aa895ccbaf57f689
Author: msoneja <msoneja@cisco.com>
Date:   Wed Aug 10 11:36:34 2022 +0000

    helpers: make install_oops_handle and remove_oops_handle so_public, install process.h and sigsafe.h
---

diff --git a/src/helpers/CMakeLists.txt b/src/helpers/CMakeLists.txt
index 33059c92f..de23cd7f0 100644
--- a/src/helpers/CMakeLists.txt
+++ b/src/helpers/CMakeLists.txt
@@ -13,12 +13,14 @@ endif ()
 set (HELPERS_INCLUDES
     ${HYPER_HEADERS}
     base64_encoder.h
-    buffer_data.h
+    bitop.h
     boyer_moore_search.h
+    buffer_data.h
+    json_stream.h
     literal_search.h
+    process.h
     scratch_allocator.h
-    json_stream.h
-    bitop.h
+    sigsafe.h
 )
 
 add_library (helpers OBJECT
@@ -40,11 +42,9 @@ add_library (helpers OBJECT
     markup.cc
     markup.h
     process.cc
-    process.h
     ring.h
     ring_logic.h
     sigsafe.cc
-    sigsafe.h
     scratch_allocator.cc
 )
 
diff --git a/src/helpers/process.h b/src/helpers/process.h
index 885252a62..24048a97d 100644
--- a/src/helpers/process.h
+++ b/src/helpers/process.h
@@ -19,6 +19,8 @@
 #ifndef PROCESS_H
 #define PROCESS_H
 
+#include "main/snort_types.h"
+
 // process oriented services like signal handling, heap info, etc.
 
 enum PigSignal
@@ -39,8 +41,8 @@ const char* get_signal_name(PigSignal);
 
 void init_signals();
 void term_signals();
-void install_oops_handler();
-void remove_oops_handler();
+SO_PUBLIC void install_oops_handler();
+SO_PUBLIC void remove_oops_handler();
 void help_signals();
 
 void daemonize();
diff --git a/src/helpers/sigsafe.h b/src/helpers/sigsafe.h
index 178cfacb1..4f0efef62 100644
--- a/src/helpers/sigsafe.h
+++ b/src/helpers/sigsafe.h
@@ -23,7 +23,9 @@
 #include <cstddef>
 #include <cstdint>
 
-class SigSafePrinter
+#include "main/snort_types.h"
+
+class SO_PUBLIC SigSafePrinter
 {
 public:
     SigSafePrinter(char *buf, size_t size);