Skip to content

Commit

Permalink
detect: remove STREAM_FLUSH
Browse files Browse the repository at this point in the history
It is unused in the code so can be removed.

Ticket: OISF#5799
  • Loading branch information
regit authored and victorjulien committed Mar 31, 2023
1 parent 29e7027 commit 236869b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion rust/src/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions src/detect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)) {
Expand Down

0 comments on commit 236869b

Please sign in to comment.