]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
stream: simplify drop handling
authorVictor Julien <vjulien@oisf.net>
Wed, 31 May 2023 13:52:54 +0000 (15:52 +0200)
committerVictor Julien <vjulien@oisf.net>
Fri, 2 Jun 2023 09:21:47 +0000 (11:21 +0200)
Remove logic to apply flow drop, as this is now handled in the
flow engine.

However, keep the logic that frees/cleans the session state.

src/stream-tcp.c

index 5c355ee723243fac505199cdab9408a385b53b03..ec87745c3b1ba27b1af4c591ac3628c67f80a8b2 100644 (file)
@@ -5356,11 +5356,9 @@ int StreamTcpPacket (ThreadVars *tv, Packet *p, StreamTcpThread *stt,
      * applayer detection, then drop the rest of the packets of the
      * same stream and avoid inspecting it any further */
     if (StreamTcpCheckFlowDrops(p) == 1) {
-        SCLogDebug("This flow/stream triggered a drop rule");
-        FlowSetNoPacketInspectionFlag(p->flow);
-        DecodeSetNoPacketInspectionFlag(p);
+        DEBUG_VALIDATE_BUG_ON(!(PKT_IS_PSEUDOPKT(p)) && !PacketCheckAction(p, ACTION_DROP));
+        SCLogDebug("flow triggered a drop rule");
         StreamTcpDisableAppLayer(p->flow);
-        PacketDrop(p, ACTION_DROP, PKT_DROP_REASON_FLOW_DROP);
         /* return the segments to the pool */
         StreamTcpSessionPktFree(p);
         SCReturnInt(0);