From: Rishabh Duggal (riduggal) Date: Wed, 5 Jul 2023 17:11:06 +0000 (+0000) Subject: Pull request #3899: flow: changes to support derived classes of parent class Flow X-Git-Tag: 3.1.66.0~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09c65f2c05792e9fc8b5adba52d99add9a970d82;p=thirdparty%2Fsnort3.git 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 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 8307bbf49..530a81edd 100644 --- 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 a70366332..96ac1853d 100644 --- 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;