Merge pull request #2186 in SNORT/snort3 from ~RUTIAN/snort3:stash_captive_portal...

Squashed commit of the following:

commit 3be74831ae44aba42fbe37601511fc501d456ddc
Author: Ruiqi Tian <rutian@cisco.com>
Date:   Tue Apr 28 21:11:02 2020 -0400

    memory: expose memory_cap.h to plugins

diff --git a/src/memory/CMakeLists.txt b/src/memory/CMakeLists.txt
index 182861556b9a3699790989ae23a5cd8fa722c42b..3b60f8142592e2e4517e1a903f4a314939cf69a8 100644 (file)
--- a/src/memory/CMakeLists.txt
+++ b/src/memory/CMakeLists.txt
@@ -1,6 +1,10 @@
+set (MEMCAP_INCLUDES
+    memory_cap.h
+)
+
 set ( MEMORY_SOURCES
+    ${MEMCAP_INCLUDES}
     memory_cap.cc
-    memory_cap.h
     memory_module.cc
     memory_module.h
     memory_config.h
@@ -11,3 +15,7 @@ set ( MEMORY_SOURCES
 add_library ( memory OBJECT
     ${MEMORY_SOURCES}
 )
+
+install(FILES ${MEMCAP_INCLUDES}
+    DESTINATION "${INCLUDE_INSTALL_PATH}/memory/"
+)

diff --git a/src/memory/memory_cap.h b/src/memory/memory_cap.h
index 450f3322f4305bc1a474c1c40e221478d52d58b6..116ce8d55cc734c35137785b25e2f40560955e61 100644 (file)
--- a/src/memory/memory_cap.h
+++ b/src/memory/memory_cap.h
@@ -28,7 +28,7 @@
 namespace memory
 {
 
-class MemoryCap
+class SO_PUBLIC MemoryCap
 {
 public:
     static bool free_space(size_t);