Pull request #3899: flow: changes to support derived classes of parent class Flow

Merge in SNORT/snort3 from ~RIDUGGAL/snort3:rev_cc_support to master

Squashed commit of the following:

commit 01d4ba9884d67f63542a306bc439731142e893fc
Author: riduggal <riduggal@cisco.com>
Date:   Tue Jun 20 10:23:20 2023 +0000

    flow: changes to support derived classes of parent class Flow

diff --git a/src/flow/flow.h b/src/flow/flow.h
index 8307bbf4948d084ef4d158a98e300f2358b72693..530a81edd866b6996ee88b9863d593015c9f54f4 100644 (file)
--- a/src/flow/flow.h
+++ b/src/flow/flow.h
@@ -183,7 +183,7 @@ public:
         ALLOW
     };
     Flow() = default;
-    ~Flow();
+    virtual ~Flow();
 
     Flow(const Flow&) = delete;
     Flow& operator=(const Flow&) = delete;
@@ -366,7 +366,7 @@ public:
         data = nullptr;
     }
 
-    void disable_inspection()
+    virtual void disable_inspection()
     { flags.disable_inspect = true; }
 
     bool is_inspection_disabled() const

diff --git a/src/stream/test/stream_splitter_test.cc b/src/stream/test/stream_splitter_test.cc
index a703663327ee64a7d2674c0971cd07f48a79ccfe..96ac1853d007c32421f0def7ca8391dd51ee0bc9 100644 (file)
--- a/src/stream/test/stream_splitter_test.cc
+++ b/src/stream/test/stream_splitter_test.cc
@@ -44,6 +44,7 @@ const SnortConfig* SnortConfig::get_conf()
 
 static StreamSplitter* next_splitter = nullptr;
 
+Flow::~Flow() = default;
 Packet::Packet(bool) { }
 Packet::~Packet() = default;