Pull request #3968: framework: Add virtual for inspectors that publish data when...

Merge in SNORT/snort3 from ~STECHEW/snort3:dns_support_no_ips to master

Squashed commit of the following:

commit 12b31bdbac8c99c0e83b3e3a3e0e2f1922b90ea7
Author: Steve Chew <stechew@cisco.com>
Date:   Tue Aug 22 22:54:30 2023 -0400

    framework: Add virtual for inspectors that publish data when no ips policy is enabled.

diff --git a/src/framework/inspector.h b/src/framework/inspector.h
index 22320dd1dd7a550038b844082d5ab0090f2dbc30..ae531728ede1a433e186f2c247eb9c91e69532e0 100644 (file)
--- a/src/framework/inspector.h
+++ b/src/framework/inspector.h
@@ -185,6 +185,9 @@ public:
     virtual bool can_start_tls() const
     { return false; }
 
+    virtual bool supports_no_ips() const
+    { return false; }
+
     void allocate_thread_storage();
     void set_thread_specific_data(void*);
     void* get_thread_specific_data() const;

diff --git a/src/service_inspectors/dns/dns.cc b/src/service_inspectors/dns/dns.cc
index edfb55811669b7bbec3b639c7f6af8cb3995278a..83f6f91b65544c77dc07779808126d2b9f4695a2 100644 (file)
--- a/src/service_inspectors/dns/dns.cc
+++ b/src/service_inspectors/dns/dns.cc
@@ -1052,6 +1052,9 @@ public:
     void show(const snort::SnortConfig*) const override;
     static unsigned get_pub_id() { return pub_id; }
 
+    bool supports_no_ips() const override
+    { return true; }
+
 private:
     const DnsConfig* config = nullptr;
     static unsigned pub_id;

diff --git a/src/service_inspectors/netflow/netflow.cc b/src/service_inspectors/netflow/netflow.cc
index 6372ab5afe00ecc908d1a9b468789efff910ef79..fcd905dea7751ef28a924304d5519067c6ba2c21 100644 (file)
--- a/src/service_inspectors/netflow/netflow.cc
+++ b/src/service_inspectors/netflow/netflow.cc
@@ -776,6 +776,9 @@ public:
     bool is_control_channel() const override
     { return true; }
 
+    bool supports_no_ips() const override
+    { return true; }
+
 private:
     const NetFlowConfig *config;