From 236869bc582b312bc0a36316e64f2de7e87eb293 Mon Sep 17 00:00:00 2001 From: Eric Leblond Date: Fri, 20 Jan 2023 11:08:11 +0100 Subject: [PATCH] detect: remove STREAM_FLUSH It is unused in the code so can be removed. Ticket: #5799 --- rust/src/core.rs | 1 - src/detect.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/rust/src/core.rs b/rust/src/core.rs index 64a6c843d0..3f892bf528 100644 --- a/rust/src/core.rs +++ b/rust/src/core.rs @@ -38,7 +38,6 @@ pub const STREAM_TOCLIENT: u8 = 0x08; pub const STREAM_GAP: u8 = 0x10; pub const STREAM_DEPTH: u8 = 0x20; pub const STREAM_MIDSTREAM:u8 = 0x40; -pub const STREAM_FLUSH: u8 = 0x80; pub const DIR_BOTH: u8 = 0b0000_1100; const DIR_TOSERVER: u8 = 0b0000_0100; const DIR_TOCLIENT: u8 = 0b0000_1000; diff --git a/src/detect.c b/src/detect.c index e195570877..2dbbdc0c45 100644 --- a/src/detect.c +++ b/src/detect.c @@ -898,7 +898,6 @@ static DetectRunScratchpad DetectRunSetup( if (p->proto == IPPROTO_TCP && pflow->protoctx && StreamReassembleRawHasDataReady(pflow->protoctx, p)) { p->flags |= PKT_DETECT_HAS_STREAMDATA; - flow_flags |= STREAM_FLUSH; } SCLogDebug("alproto %u", alproto); } else { @@ -1078,12 +1077,7 @@ static bool DetectRunTxInspectRule(ThreadVars *tv, bool mpm_before_progress = false; // is mpm engine before progress? bool mpm_in_progress = false; // is mpm engine in a buffer we will revisit? - /* see if we want to pass on the FLUSH flag */ - if ((s->flags & SIG_FLAG_FLUSH) == 0) - flow_flags &=~ STREAM_FLUSH; - TRACE_SID_TXS(s->id, tx, "starting %s", direction ? "toclient" : "toserver"); - TRACE_SID_TXS(s->id, tx, "FLUSH? %s", (flow_flags & STREAM_FLUSH)?"true":"false"); /* for a new inspection we inspect pkt header and packet matches */ if (likely(stored_flags == NULL)) { -- 2.47.2