From: Steve Chew (stechew) <stechew@cisco.com>
Date: Tue, 15 Jun 2021 22:10:26 +0000 (+0000)
Subject: Merge pull request #2945 in SNORT/snort3 from ~SBAIGAL/snort3:shell3 to master
X-Git-Tag: 3.1.6.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13922cc04cedd4128d17dead45307568e1e584f5;p=thirdparty%2Fsnort3.git

Merge pull request #2945 in SNORT/snort3 from ~SBAIGAL/snort3:shell3 to master

Squashed commit of the following:

commit 3a742fa01840835d4c7f92caac80e8ded9176d1b
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Tue Jun 15 09:08:33 2021 -0400

    control: remove SHELL compile flag from header
---

diff --git a/src/control/CMakeLists.txt b/src/control/CMakeLists.txt
index 857ca316a..6b22e8039 100644
--- a/src/control/CMakeLists.txt
+++ b/src/control/CMakeLists.txt
@@ -1,11 +1,11 @@
 set ( CONTROL_INCLUDES  control.h )
 
 if ( ENABLE_SHELL )
-    set ( SHELL_SOURCES control.cc control_mgmt.cc control_mgmt.h )
+    set ( SHELL_SOURCES control_mgmt.cc control_mgmt.h )
 endif ( ENABLE_SHELL )
 
 add_library ( control OBJECT
-    control.h
+    control.cc
     ${SHELL_SOURCES}
 )
 
diff --git a/src/control/control.cc b/src/control/control.cc
index e2d34cca1..2a074eebe 100644
--- a/src/control/control.cc
+++ b/src/control/control.cc
@@ -37,7 +37,12 @@ using namespace snort;
 
 ControlConn* ControlConn::query_from_lua(const lua_State* L)
 {
+#ifdef SHELL
     return ControlMgmt::find_control(L);
+#else
+    UNUSED(L);
+    return nullptr;
+#endif
 }
 
 //------------------------------------------------------------------------
diff --git a/src/control/control.h b/src/control/control.h
index 09bc40ca2..29333df2d 100644
--- a/src/control/control.h
+++ b/src/control/control.h
@@ -34,7 +34,6 @@ struct lua_State;
 class ControlConn
 {
 public:
-#ifdef SHELL
     ControlConn(int fd, bool local);
     ~ControlConn();
 
@@ -69,14 +68,8 @@ private:
     std::string next_command;
     class Shell *shell;
     int fd;
-    bool local;
+    bool local = false;
     bool blocked = false;
-#else
-    SO_PUBLIC bool is_local() const { return false; }
-    SO_PUBLIC bool respond(const char*, va_list&) { return false;}
-    SO_PUBLIC bool respond(const char*, ...) __attribute__((format (printf, 2, 3))) { return false; }
-    SO_PUBLIC static ControlConn* query_from_lua(const lua_State*) { return nullptr; }
-#endif
 };
 
 #endif
diff --git a/src/host_tracker/test/host_cache_module_test.cc b/src/host_tracker/test/host_cache_module_test.cc
index 1ca95e289..63d0b7c28 100644
--- a/src/host_tracker/test/host_cache_module_test.cc
+++ b/src/host_tracker/test/host_cache_module_test.cc
@@ -44,13 +44,13 @@ using namespace snort;
 static HostCacheModule module;
 #define LOG_MAX 128
 static char logged_message[LOG_MAX+1];
-#ifdef SHELL
+
 static ControlConn ctrlcon(1, true);
 ControlConn::ControlConn(int, bool) {}
 ControlConn::~ControlConn() {}
 ControlConn* ControlConn::query_from_lua(const lua_State*) { return &ctrlcon; }
 bool ControlConn::respond(const char*, ...) { return true; }
-#endif
+
 namespace snort
 {
 const SnortConfig* SnortConfig::get_conf()
diff --git a/src/network_inspectors/rna/test/rna_module_mock.h b/src/network_inspectors/rna/test/rna_module_mock.h
index 042928ec7..75eed5935 100644
--- a/src/network_inspectors/rna/test/rna_module_mock.h
+++ b/src/network_inspectors/rna/test/rna_module_mock.h
@@ -105,13 +105,13 @@ private:
 } // end of namespace snort
 
 void snort::main_broadcast_command(snort::AnalyzerCommand*, ControlConn*) {}
-#ifdef SHELL
+
 static ControlConn s_ctrlcon(1, true);
 ControlConn::ControlConn(int, bool) {}
 ControlConn::~ControlConn() {}
 ControlConn* ControlConn::query_from_lua(const lua_State*) { return &s_ctrlcon; }
 bool ControlConn::respond(const char*, ...) { return true; }
-#endif
+
 HostCacheMac* get_host_cache_mac() { return nullptr; }
 
 DataPurgeAC::~DataPurgeAC() = default;