Merge pull request #2923 in SNORT/snort3 from ~SBAIGAL/snort3:shell2 to master

Squashed commit of the following:

commit d6c6e803d46423198b4a7bed1c610ea10db799c5
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Fri Jun 4 10:13:26 2021 -0400

    control: cleanup cppcheck issues

diff --git a/src/control/control.h b/src/control/control.h
index 182740da7d43339cf9e791be82c4a997e2ef85ef..09bc40ca2ed80fe8949f3782175257f7618ea857 100644 (file)
--- a/src/control/control.h
+++ b/src/control/control.h
@@ -73,8 +73,8 @@ private:
     bool blocked = false;
 #else
     SO_PUBLIC bool is_local() const { return false; }
-    SO_PUBLIC bool respond(const char* format, va_list& ap) { return false;}
-    SO_PUBLIC bool respond(const char* format, ...) __attribute__((format (printf, 2, 3))) { 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
 };

diff --git a/src/host_tracker/test/host_cache_module_test.cc b/src/host_tracker/test/host_cache_module_test.cc
index 6a495290c95c2ab0d1750d1c99c9cc6b12efdc04..aad99bc732b60a1f6f8418492587563c2009a931 100644 (file)
--- 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 367bb92c022f5ef91f2c36393efcf8bf69f89de9..a58c787b6d844ec2a15150eb3d83effbd36ccf0d 100644 (file)
--- a/src/network_inspectors/rna/test/rna_module_mock.h
+++ b/src/network_inspectors/rna/test/rna_module_mock.h
@@ -112,12 +112,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;