Merge pull request #1939 in SNORT/snort3 from ~SVLASIUK/snort3:multiple_ftp_server_in...

Squashed commit of the following:

commit 29b6f44f49d8d15a30d0fe8c37e43ff80fbb1630
Author: Serhii Vlasiuk <svlasiuk@cisco.com>
Date:   Mon Jan 13 12:21:27 2020 +0200

    inspectors: print label for type and alias in inspector manager. Remove printing module name in inspectors ::show() method.

diff --git a/src/file_api/file_flows.cc b/src/file_api/file_flows.cc
index 205a38c7291ddf84d42a866f5ea2bb13466fba55..51c58f72b96d4d11c1fe6cf4e1699e26402ae17b 100644 (file)
--- a/src/file_api/file_flows.cc
+++ b/src/file_api/file_flows.cc
@@ -379,7 +379,6 @@ void FileInspect::show(SnortConfig*)
     if (!config)
         return;
 
-    LogMessage("%s\n", FILE_ID_NAME);
     LogMessage("    capture_memcap: %zu MB\n", config->capture_memcap);
     LogMessage("    capture_max_size: %zu bytes\n", config->capture_max_size);
     LogMessage("    capture_min_size: %zu bytes\n", config->capture_min_size);

diff --git a/src/file_api/file_log.cc b/src/file_api/file_log.cc
index 665f1ebb1107f324a415ec4ad98f31e83fad6566..2abdef09248d9f9c6bbec09a8199683d23685b97 100644 (file)
--- a/src/file_api/file_log.cc
+++ b/src/file_api/file_log.cc
@@ -221,7 +221,6 @@ private:
 
 void FileLog::show(SnortConfig*)
 {
-    LogMessage("%s config:\n", s_name);
     LogMessage("    Log system time: %s\n", config.log_sys_time ? "true" : "false");
     LogMessage("    Log packet time: %s\n", config.log_pkt_time ? "true" : "false");
 }

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index ec700d209c103983c5e5c3a4616c0212d95287ae..194c92c53eb11ebafa789deb3916631a4f6ea950 100644 (file)
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -954,7 +954,15 @@ void InspectorManager::print_config(SnortConfig* sc)
         return;
 
     for ( auto* p : pi->framework_policy->ilist )
+    {
+        std::string inspector_name(p->pp_class.api.base.name);
+        if ( !p->name.empty() )
+            inspector_name += " (" + p->name + "):";
+        else
+            inspector_name += ":";
+        LogLabel(inspector_name.c_str());
         p->handler->show(sc);
+    }
 }
 
 //-------------------------------------------------------------------------

diff --git a/src/managers/module_manager.cc b/src/managers/module_manager.cc
index 73337d8858c8eb63a357397359591fde14a290e3..665be3ed378d9c9016a23ef6c385b2bc0fdaccc1 100644 (file)
--- a/src/managers/module_manager.cc
+++ b/src/managers/module_manager.cc
@@ -754,13 +754,17 @@ SO_PUBLIC bool open_table(const char* s, int idx)
         }
     }
 
-    if ( s_current != key )
+    string unique_key = key;
+    if ( !s_name.empty() )
+        unique_key = s_name;
+
+    if ( s_current != unique_key )
     {
         if ( fqn != orig )
             LogMessage("\t%s (%s)\n", key.c_str(), orig);
         else
             LogMessage("\t%s\n", key.c_str());
-        s_current = key;
+        s_current = unique_key;
     }
 
     if ( !begin(m, p, s, idx, 0) )

diff --git a/src/network_inspectors/appid/appid_inspector.cc b/src/network_inspectors/appid/appid_inspector.cc
index 116cb7a9ef138cc6b48a59487c6c72d8707f7b60..8f78db6c5b4df81f05f563f2d42603ff5627ca6e 100644 (file)
--- a/src/network_inspectors/appid/appid_inspector.cc
+++ b/src/network_inspectors/appid/appid_inspector.cc
@@ -129,8 +129,6 @@ bool AppIdInspector::configure(SnortConfig* sc)
 
 void AppIdInspector::show(SnortConfig*)
 {
-    LogMessage("%s\n", MOD_NAME);
-
     LogMessage("    Detector Path:          %s\n", config->app_detector_dir);
     LogMessage("    appStats Logging:       %s\n", config->stats_logging_enabled ? "enabled" :
         "disabled");

diff --git a/src/network_inspectors/arp_spoof/arp_spoof.cc b/src/network_inspectors/arp_spoof/arp_spoof.cc
index 3b3295de637ea48af38e5296097cfa8613f82922..2d941c91b16a15e38a3a473a131e3b85c76c6b95 100644 (file)
--- a/src/network_inspectors/arp_spoof/arp_spoof.cc
+++ b/src/network_inspectors/arp_spoof/arp_spoof.cc
@@ -113,7 +113,6 @@ public:
     ArpSpoof(ArpSpoofModule*);
     ~ArpSpoof() override;
 
-    void show(SnortConfig*) override;
     void eval(Packet*) override;
 
 private:
@@ -130,12 +129,6 @@ ArpSpoof::~ArpSpoof ()
     delete config;
 }
 
-void ArpSpoof::show(SnortConfig*)
-{
-    LogMessage("arpspoof configured\n");
-
-}
-
 void ArpSpoof::eval(Packet* p)
 {
     Profile profile(arpPerfStats);

diff --git a/src/network_inspectors/binder/binder.cc b/src/network_inspectors/binder/binder.cc
index f28b563f77779660643561cdcc994870302b8cd1..d408a309c3ac995bc346250e7d1fbf9de58b55f6 100644 (file)
--- a/src/network_inspectors/binder/binder.cc
+++ b/src/network_inspectors/binder/binder.cc
@@ -633,9 +633,6 @@ public:
     Binder(vector<Binding*>&);
     ~Binder() override;
 
-    void show(SnortConfig*) override
-    { LogMessage("Binder\n"); }
-
     void remove_inspector_binding(SnortConfig*, const char*) override;
 
     bool configure(SnortConfig*) override;

diff --git a/src/network_inspectors/normalize/normalize.cc b/src/network_inspectors/normalize/normalize.cc
index e1c2a1f18a2c645794559119676ca413a450d2b1..da28a2eefcb97b92c26055bfd408689f906b8c2f 100644 (file)
--- a/src/network_inspectors/normalize/normalize.cc
+++ b/src/network_inspectors/normalize/normalize.cc
@@ -232,7 +232,6 @@ NormMode Normalize_GetMode(NormFlags nf)
 
 void Normalizer::show(SnortConfig* sc)
 {
-    LogMessage("Normalizer config:\n");
     Print_IP4(sc, &config);
     Print_IP6(sc, &config);
     Print_ICMP4(&config);

diff --git a/src/network_inspectors/perf_monitor/perf_monitor.cc b/src/network_inspectors/perf_monitor/perf_monitor.cc
index df2425a16a4b7ff23c2985e311cc35be9006f74a..e3ed39fd9d2171c0d9ee140eac65bfe251b30c5a 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_monitor.cc
+++ b/src/network_inspectors/perf_monitor/perf_monitor.cc
@@ -148,7 +148,6 @@ PerfMonitor::PerfMonitor(PerfConfig* pcfg) : config(pcfg)
 
 void PerfMonitor::show(SnortConfig*)
 {
-    LogMessage("PerfMonitor config:\n");
     LogMessage("  Sample Time:      %d seconds\n", config->sample_interval);
     LogMessage("  Packet Count:     %d\n", config->pkt_cnt);
     LogMessage("  Max File Size:    " STDu64 "\n", config->max_file_size);

diff --git a/src/network_inspectors/port_scan/port_scan.cc b/src/network_inspectors/port_scan/port_scan.cc
index e9b47e59e73941d841c49658cb2a186d3967cecf..75913d3031f7655046ac4dfbfeab9dd952090109 100644 (file)
--- a/src/network_inspectors/port_scan/port_scan.cc
+++ b/src/network_inspectors/port_scan/port_scan.cc
@@ -332,7 +332,6 @@ static void PrintPortscanConf(PortscanConfig* config)
 {
     char buf[STD_BUF + 1];
 
-    LogMessage("Portscan Detection Config:\n");
     SnortSnprintf(buf, sizeof(buf), "    Detect Protocols:  ");
 
     if ( config->detect_scans & PS_PROTO_TCP )

diff --git a/src/network_inspectors/reputation/reputation_inspect.cc b/src/network_inspectors/reputation/reputation_inspect.cc
index fdb671d30bf0475cb8c875eb808d051b78010f47..d332976910de5c3cb9b426e75b98819e2134adc2 100644 (file)
--- a/src/network_inspectors/reputation/reputation_inspect.cc
+++ b/src/network_inspectors/reputation/reputation_inspect.cc
@@ -89,7 +89,6 @@ static void print_reputation_conf(ReputationConfig* config)
 {
     assert(config);
 
-    LogMessage("%s\n", REPUTATION_NAME);
     print_iplist_stats(config);
 
     LogMessage("    Memcap: %d %s \n",

diff --git a/src/network_inspectors/rna/rna_inspector.cc b/src/network_inspectors/rna/rna_inspector.cc
index 2f3206a2b782f7b4c918e625d7e291522a8d65b6..f3a68632090564e6fc05cd2e93019450a6f7fbe5 100644 (file)
--- a/src/network_inspectors/rna/rna_inspector.cc
+++ b/src/network_inspectors/rna/rna_inspector.cc
@@ -102,8 +102,6 @@ void RnaInspector::eval(Packet* p)
 
 void RnaInspector::show(SnortConfig*)
 {
-    LogMessage("RNA Configuration\n");
-
     if (mod_conf)
     {
         if (!mod_conf->rna_conf_path.empty())

diff --git a/src/service_inspectors/back_orifice/back_orifice.cc b/src/service_inspectors/back_orifice/back_orifice.cc
index 478cb777963747185d735046facf9c3500698c70..9594b8a87582dff1c51737847cfc90743f797775 100644 (file)
--- a/src/service_inspectors/back_orifice/back_orifice.cc
+++ b/src/service_inspectors/back_orifice/back_orifice.cc
@@ -429,16 +429,10 @@ class BackOrifice : public Inspector
 {
 public:
     BackOrifice() = default;
-
-    void show(SnortConfig*) override;
+    
     void eval(Packet*) override;
 };
 
-void BackOrifice::show(SnortConfig*)
-{
-    LogMessage("%s\n", s_name);
-}
-
 void BackOrifice::eval(Packet* p)
 {
     Profile profile(boPerfStats);

diff --git a/src/service_inspectors/cip/cip.cc b/src/service_inspectors/cip/cip.cc
index 235242366c4271c3366acbaf4896cad520eee10b..70c46a189d855b679ead600716e13c6a6cb27264 100644 (file)
--- a/src/service_inspectors/cip/cip.cc
+++ b/src/service_inspectors/cip/cip.cc
@@ -115,7 +115,6 @@ static void print_cip_conf(CipProtoConf* config)
 {
     if (config == nullptr)
         return;
-    LogMessage("CIP config: \n");
     LogMessage("    Embedded Enabled: %s\n",
         config->embedded_cip_enabled ? "ENABLED" : "DISABLED");
     if (config->embedded_cip_enabled)

diff --git a/src/service_inspectors/dce_rpc/dce_smb_module.cc b/src/service_inspectors/dce_rpc/dce_smb_module.cc
index ae8e280670d0f1553d9038ea16b20b9463a0b677..edb0cdd061ce09c1dff9dee2f364b1e793bd8eb3 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_smb_module.cc
+++ b/src/service_inspectors/dce_rpc/dce_smb_module.cc
@@ -383,8 +383,6 @@ void Dce2SmbModule::get_data(dce2SmbProtoConf& dce2_smb_config)
 
 void print_dce2_smb_conf(dce2SmbProtoConf& config)
 {
-    LogMessage("DCE SMB config: \n");
-
     print_dce2_co_config(config.common);
     LogMessage("    SMB fingerprint policy : %s\n",
         dce2SmbFingerprintPolicyStrings[config.smb_fingerprint_policy]);

diff --git a/src/service_inspectors/dce_rpc/dce_tcp_module.cc b/src/service_inspectors/dce_rpc/dce_tcp_module.cc
index e9da1877a540088ed0d34de1fe9a1136d9c24e20..1598b4a1eb4482d865cc5e545d61cbb5f3a4833b 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_tcp_module.cc
+++ b/src/service_inspectors/dce_rpc/dce_tcp_module.cc
@@ -157,7 +157,6 @@ void Dce2TcpModule::get_data(dce2TcpProtoConf& dce2_tcp_config)
 
 void print_dce2_tcp_conf(dce2TcpProtoConf& config)
 {
-    LogMessage("DCE TCP config: \n");
     print_dce2_co_config(config.common);
 }
 

diff --git a/src/service_inspectors/dce_rpc/dce_udp_module.cc b/src/service_inspectors/dce_rpc/dce_udp_module.cc
index b4b915cbd9c98081128afc03b6f02a6a9ec33217..fb31dfbd935a0dc398a11217c5c4820369cecfb0 100644 (file)
--- a/src/service_inspectors/dce_rpc/dce_udp_module.cc
+++ b/src/service_inspectors/dce_rpc/dce_udp_module.cc
@@ -123,7 +123,6 @@ void Dce2UdpModule::get_data(dce2UdpProtoConf& dce2_udp_config)
 
 void print_dce2_udp_conf(dce2UdpProtoConf& config)
 {
-    LogMessage("DCE UDP config: \n");
     print_dce2_common_config(config.common);
 }
 

diff --git a/src/service_inspectors/dnp3/dnp3_module.cc b/src/service_inspectors/dnp3/dnp3_module.cc
index 754c6eec3f4014b0b99bbdd6a748a18be4ed4cbc..63e1f9d098ddfa64ccc5eb859d962d9f5f9c1d4d 100644 (file)
--- a/src/service_inspectors/dnp3/dnp3_module.cc
+++ b/src/service_inspectors/dnp3/dnp3_module.cc
@@ -104,7 +104,6 @@ void Dnp3Module::get_data(dnp3ProtoConf& dnp3_config)
 
 void print_dnp3_conf(const dnp3ProtoConf& config)
 {
-    LogMessage("DNP3 config: \n");
     LogMessage("    Check CRC: %s\n",
         config.check_crc ?
         "ENABLED" : "DISABLED");

diff --git a/src/service_inspectors/dns/dns.cc b/src/service_inspectors/dns/dns.cc
index 1d5bf4cd191ddf5ffdba9a306903c475d7e79802..2fe9d657e722c5366d43befa1113aefcee75d171 100644 (file)
--- a/src/service_inspectors/dns/dns.cc
+++ b/src/service_inspectors/dns/dns.cc
@@ -1011,18 +1011,12 @@ class Dns : public Inspector
 public:
     Dns(DnsModule*);
 
-    void show(SnortConfig*) override;
     void eval(Packet*) override;
 };
 
 Dns::Dns(DnsModule*)
 { }
 
-void Dns::show(SnortConfig*)
-{
-    LogMessage("DNS\n");
-}
-
 void Dns::eval(Packet* p)
 {
     // precondition - what we registered for

diff --git a/src/service_inspectors/ftp_telnet/ftp.cc b/src/service_inspectors/ftp_telnet/ftp.cc
index 0350210223d65590284602846ff7a9d9afbbd239..47de077c4a77c6d16880ed00a27b28dd240e03cb 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp.cc
+++ b/src/service_inspectors/ftp_telnet/ftp.cc
@@ -201,10 +201,9 @@ public:
     FTP_SERVER_PROTO_CONF* ftp_server;
 };
 
-FtpServer::FtpServer(FTP_SERVER_PROTO_CONF* server)
-{
-    ftp_server = server;
-}
+FtpServer::FtpServer(FTP_SERVER_PROTO_CONF* server) :
+    ftp_server(server)
+{}
 
 FtpServer::~FtpServer ()
 {

diff --git a/src/service_inspectors/ftp_telnet/ftp_print.cc b/src/service_inspectors/ftp_telnet/ftp_print.cc
index d58fe1d9481cea054a18f120eac41ac48fdb1494..834d2f3ea01993895c9d0756614f1ec59f4d31f0 100644 (file)
--- a/src/service_inspectors/ftp_telnet/ftp_print.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_print.cc
@@ -237,8 +237,6 @@ int PrintFTPServerConf(FTP_SERVER_PROTO_CONF* ServerConf)
         return FTPP_INVALID_ARG;
     }
 
-    LogMessage(FTP_SERVER_NAME ":\n");
-
     PrintConfOpt(ServerConf->telnet_cmds, "Check for Telnet Cmds");
     PrintConfOpt(ServerConf->ignore_telnet_erase_cmds, "Ignore Telnet Cmd Operations");
     LogMessage("    Ignore open data channels: %s\n",

diff --git a/src/service_inspectors/ftp_telnet/telnet.cc b/src/service_inspectors/ftp_telnet/telnet.cc
index 7f49b84ad6e2e415aee6bd6215ebc5ac46cd8d09..6efc8bdc48a193fa3f2609bf19c4b0e984c6c520 100644 (file)
--- a/src/service_inspectors/ftp_telnet/telnet.cc
+++ b/src/service_inspectors/ftp_telnet/telnet.cc
@@ -193,7 +193,6 @@ static int PrintTelnetConf(TELNET_PROTO_CONF* TelnetConf)
         return FTPP_INVALID_ARG;
     }
 
-    LogMessage("    TELNET CONFIG:\n");
     LogMessage("      Are You There Threshold: %d\n",
         TelnetConf->ayt_threshold);
     LogMessage("      Normalize: %s\n", TelnetConf->normalize ? "YES" : "NO");

diff --git a/src/service_inspectors/http2_inspect/http2_inspect.h b/src/service_inspectors/http2_inspect/http2_inspect.h
index 8249654f5d7aa4336ca8f86c7374460096522d97..cc5d3b7ed7e0c60083cf5a1c27faa5df85cbe17b 100644 (file)
--- a/src/service_inspectors/http2_inspect/http2_inspect.h
+++ b/src/service_inspectors/http2_inspect/http2_inspect.h
@@ -45,7 +45,6 @@ public:
     bool get_fp_buf(snort::InspectionBuffer::Type ibt, snort::Packet* p,
         snort::InspectionBuffer& b) override;
     bool configure(snort::SnortConfig*) override;
-    void show(snort::SnortConfig*) override { snort::LogMessage("Http2Inspect\n"); }
     void eval(snort::Packet* p) override;
     void clear(snort::Packet* p) override;
     Http2StreamSplitter* get_splitter(bool is_client_to_server) override

diff --git a/src/service_inspectors/http_inspect/http_inspect.cc b/src/service_inspectors/http_inspect/http_inspect.cc
index 5892bb6c4181727f124e5f12727d1c87044e4e48..7317a1d4058af46471261eff7f877072a8651d47 100644 (file)
--- a/src/service_inspectors/http_inspect/http_inspect.cc
+++ b/src/service_inspectors/http_inspect/http_inspect.cc
@@ -92,7 +92,6 @@ bool HttpInspect::configure(SnortConfig* )
 void HttpInspect::show(snort::SnortConfig*)
 {
     assert(params);
-    LogMessage("http_inspect\n");
 
     if ( params->request_depth == -1 )
         LogMessage("    request_depth: " "%s" "\n", "unlimited");

diff --git a/src/service_inspectors/imap/imap.cc b/src/service_inspectors/imap/imap.cc
index 756fe6736c4d08d3952f4bfa798ec180c0817001..144f65815dbfbe2d87c36847683952593fdd585c 100644 (file)
--- a/src/service_inspectors/imap/imap.cc
+++ b/src/service_inspectors/imap/imap.cc
@@ -266,8 +266,6 @@ static void PrintImapConf(IMAP_PROTO_CONF* config)
     if (config == nullptr)
         return;
 
-    LogMessage("IMAP config: \n");
-
     config->decode_conf.print_decode_conf();
 
     LogMessage("\n");

diff --git a/src/service_inspectors/pop/pop.cc b/src/service_inspectors/pop/pop.cc
index 17f76164d87b81240d22786abfb325f2c1b5f5a0..c108f731add63c6e0d65e1b7f2b6765d6a1aa8c9 100644 (file)
--- a/src/service_inspectors/pop/pop.cc
+++ b/src/service_inspectors/pop/pop.cc
@@ -225,8 +225,6 @@ static void PrintPopConf(POP_PROTO_CONF* config)
     if (config == nullptr)
         return;
 
-    LogMessage("POP config: \n");
-
     config->decode_conf.print_decode_conf();
 
     LogMessage("\n");

diff --git a/src/service_inspectors/rpc_decode/rpc_decode.cc b/src/service_inspectors/rpc_decode/rpc_decode.cc
index 80bf8ce5aa699581dd137a71a96c2bec5395eb63..976d07176075aa14a4375f8225f40668d5f1cbfa 100644 (file)
--- a/src/service_inspectors/rpc_decode/rpc_decode.cc
+++ b/src/service_inspectors/rpc_decode/rpc_decode.cc
@@ -803,8 +803,6 @@ class RpcDecode : public Inspector
 public:
     RpcDecode(RpcDecodeModule*);
 
-    void show(SnortConfig*) override;
-
     void eval(Packet*) override;
     void clear(Packet*) override;
 
@@ -821,11 +819,6 @@ RpcDecode::RpcDecode(RpcDecodeModule*)
 {
 }
 
-void RpcDecode::show(SnortConfig*)
-{
-    LogMessage("rpc_decode\n");
-}
-
 /*
  * Purpose: Inspects the packet's payload for fragment records and
  *          converts them into one unfragmented record.

diff --git a/src/service_inspectors/sip/sip.cc b/src/service_inspectors/sip/sip.cc
index 3b8c8e0fcd0a4cf7c7b04cae96fe8d40b9cd0e16..d4449adb0f253758396fa631fbf14197efea9b29 100644 (file)
--- a/src/service_inspectors/sip/sip.cc
+++ b/src/service_inspectors/sip/sip.cc
@@ -86,7 +86,6 @@ static void PrintSipConf(SIP_PROTO_CONF* config)
     SIPMethodNode* method;
     if (config == nullptr)
         return;
-    LogMessage("SIP config: \n");
     LogMessage("    Max number of dialogs in a session: %d %s \n",
         config->maxNumDialogsInSession,
         config->maxNumDialogsInSession

diff --git a/src/service_inspectors/smtp/smtp.cc b/src/service_inspectors/smtp/smtp.cc
index 721e4c351042b509b98379fe1b38bb862b4e3a8f..5ece42403a7d65856696228dcd66d34074421ecf 100644 (file)
--- a/src/service_inspectors/smtp/smtp.cc
+++ b/src/service_inspectors/smtp/smtp.cc
@@ -378,7 +378,6 @@ static void SMTP_PrintConfig(SMTP_PROTO_CONF* config)
     char buf[8192];
     int alert_count = 0;
 
-    LogMessage("SMTP Config:\n");
     snprintf(buf, sizeof(buf) - 1, "    Normalize: ");
 
     if (config->normalize == NORMALIZE_ALL)

diff --git a/src/service_inspectors/ssh/ssh.cc b/src/service_inspectors/ssh/ssh.cc
index bd8907dcf019ca0c5d833a278ec0c4f069a57fbd..b258e740e8d4e64b31aae9ade0b2842cb584f2ad 100644 (file)
--- a/src/service_inspectors/ssh/ssh.cc
+++ b/src/service_inspectors/ssh/ssh.cc
@@ -85,8 +85,6 @@ static void PrintSshConf(SSH_PROTO_CONF* config)
     if ( !config )
         return;
 
-    LogMessage("SSH config: \n");
-
     LogMessage("    Max Encrypted Packets: %d\n", config->MaxEncryptedPackets);
     LogMessage("    Max Server Version String Length: %d\n", config->MaxServerVersionLen);
     LogMessage("    MaxClientBytes: %d\n", config->MaxClientBytes);

diff --git a/src/service_inspectors/ssl/ssl_inspector.cc b/src/service_inspectors/ssl/ssl_inspector.cc
index 33bb8ff4908e0d4ff6bb97ba2592f66931631880..f989a1a405ed399c0ce133a8c9b83bd1609dbfa3 100644 (file)
--- a/src/service_inspectors/ssl/ssl_inspector.cc
+++ b/src/service_inspectors/ssl/ssl_inspector.cc
@@ -103,7 +103,6 @@ static void PrintSslConf(SSL_PROTO_CONF* config)
 {
     if (config == nullptr)
         return;
-    LogMessage("SSL config:\n");
     if ( config->trustservers )
     {
         LogMessage("    Server side data is trusted\n");

diff --git a/src/service_inspectors/wizard/wizard.cc b/src/service_inspectors/wizard/wizard.cc
index 6039be1a172f67b4b30bf4b6f203036f364d76f5..790b4add28bdb3204ef97c357ac8cba99537f1e8 100644 (file)
--- a/src/service_inspectors/wizard/wizard.cc
+++ b/src/service_inspectors/wizard/wizard.cc
@@ -117,9 +117,6 @@ public:
     Wizard(WizardModule*);
     ~Wizard() override;
 
-    void show(SnortConfig*) override
-    { LogMessage("Wizard\n"); }
-
     void eval(Packet*) override;
 
     StreamSplitter* get_splitter(bool) override;

diff --git a/src/stream/base/stream_base.cc b/src/stream/base/stream_base.cc
index eda0ef0f53008168c30a5c853495e474f9e957a3..3d5bc8bc8f94f5d76fa3a9f69e3251d2f6eca5c7 100644 (file)
--- a/src/stream/base/stream_base.cc
+++ b/src/stream/base/stream_base.cc
@@ -203,7 +203,6 @@ void StreamBase::tterm()
 
 void StreamBase::show(SnortConfig*)
 {
-    LogMessage("Stream Base config:\n");
     LogMessage("    Max flows: %d\n", config.flow_cache_cfg.max_flows);
     LogMessage("    Pruning timeout: %d\n", config.flow_cache_cfg.pruning_timeout);
 }

diff --git a/src/stream/icmp/stream_icmp.cc b/src/stream/icmp/stream_icmp.cc
index 00523075c671937dd877ceb268ba2bcea0856e98..21f3aa7e836fe3f7c5ae31b2119a47851869465d 100644 (file)
--- a/src/stream/icmp/stream_icmp.cc
+++ b/src/stream/icmp/stream_icmp.cc
@@ -42,7 +42,6 @@ StreamIcmpConfig::StreamIcmpConfig()
 
 static void icmp_show(StreamIcmpConfig* pc)
 {
-    LogMessage("Stream ICMP config:\n");
     LogMessage("    Timeout: %d seconds\n", pc->session_timeout);
 }
 

diff --git a/src/stream/ip/ip_defrag.cc b/src/stream/ip/ip_defrag.cc
index 4673c607dcf95e0bdcb78f4ec7b94b0a5b7d2439..df7deb4b6a028e572f871d0e7c93a80588099c0c 100644 (file)
--- a/src/stream/ip/ip_defrag.cc
+++ b/src/stream/ip/ip_defrag.cc
@@ -185,7 +185,6 @@ static const char* const frag_policy_names[] =
 
 static void FragPrintEngineConfig(FragEngine* engine)
 {
-    LogMessage("Defrag engine config:\n");
     LogMessage("    engine-based policy: %s\n",
         frag_policy_names[engine->frag_policy]);
     LogMessage("    Fragment timeout: %d seconds\n",

diff --git a/src/stream/ip/stream_ip.cc b/src/stream/ip/stream_ip.cc
index 1e0ebe056600034c0d6fbe30555254e3dee95530..74597a99ca3e45a44fe064efcf1fbf34ad598cb8 100644 (file)
--- a/src/stream/ip/stream_ip.cc
+++ b/src/stream/ip/stream_ip.cc
@@ -61,7 +61,6 @@ StreamIpConfig::StreamIpConfig()
 
 static void ip_show(StreamIpConfig* pc)
 {
-    LogMessage("Stream IP config:\n");
     LogMessage("    Timeout: %d seconds\n", pc->session_timeout);
 }
 

diff --git a/src/stream/tcp/tcp_stream_config.cc b/src/stream/tcp/tcp_stream_config.cc
index 2d2e0caa4176d96dacae364fd8b616ad38808073..213f2dea006dd3b545902be5f88cfd2882ff22a2 100644 (file)
--- a/src/stream/tcp/tcp_stream_config.cc
+++ b/src/stream/tcp/tcp_stream_config.cc
@@ -42,7 +42,6 @@ void TcpStreamConfig::show_config() const
 
 void TcpStreamConfig::show_config(const TcpStreamConfig* config)
 {
-    LogMessage("Stream TCP Policy config:\n");
     LogMessage("    Reassembly Policy: %s\n",
         reassembly_policy_names[ static_cast<int>( config->reassembly_policy ) ]);
     LogMessage("    Timeout: %d seconds\n", config->session_timeout);

diff --git a/src/stream/udp/stream_udp.cc b/src/stream/udp/stream_udp.cc
index b2867b7b4a55889b7830996fba783933590f9da8..747c2a77b03bf6936814cf6db5a2478844fc508a 100644 (file)
--- a/src/stream/udp/stream_udp.cc
+++ b/src/stream/udp/stream_udp.cc
@@ -41,7 +41,6 @@ StreamUdpConfig::StreamUdpConfig()
 
 static void udp_show(StreamUdpConfig* pc)
 {
-    LogMessage("Stream UDP config:\n");
     LogMessage("    Timeout: %d seconds\n", pc->session_timeout);
 
 #ifdef REG_TEST

diff --git a/src/stream/user/stream_user.cc b/src/stream/user/stream_user.cc
index d631e1508b7f56e730285fe7f1f41e26cb572a85..94c4f6a7388b38be7d84164dc2c88b9917efbc1f 100644 (file)
--- a/src/stream/user/stream_user.cc
+++ b/src/stream/user/stream_user.cc
@@ -41,7 +41,6 @@ StreamUserConfig::StreamUserConfig()
 
 static void user_show (StreamUserConfig* pc)
 {
-    LogMessage("Stream user config:\n");
     LogMessage("    Timeout: %d seconds\n", pc->session_timeout);
 }