decode: remove unnecessary PKT_STREAM_EOF flag

PKT_STREAM_EOF flag is set only when a pseudo packet is created. In all
the users of this flag, it suffices to use PKT_PSEUDO_STREAM_END
instead. PKT_PSEUDO_STREAM_END is the more widely used flag as well so
keep it and remove this unneeded flag creating a vacancy.

diff --git a/src/decode.h b/src/decode.h
index a283eaa2e6c62c88588a0fd403be202c7b768be0..c73282defacbe1a67569d7ae9cd18271d2c3d3b1 100644 (file)
--- a/src/decode.h
+++ b/src/decode.h
@@ -1245,8 +1245,9 @@ void DecodeUnregisterCounters(void);
 #define PKT_STREAM_ADD BIT_U32(5)
 /** Packet is part of established stream */
 #define PKT_STREAM_EST BIT_U32(6)
-/** Stream is in eof state */
-#define PKT_STREAM_EOF BIT_U32(7)
+
+// vacancy
+
 #define PKT_HAS_FLOW   BIT_U32(8)
 /** Pseudo packet to end the stream */
 #define PKT_PSEUDO_STREAM_END BIT_U32(9)

diff --git a/src/detect.c b/src/detect.c
index 8f39e8ff3054d21e854992775184cf6bfe15bc92..14eedb77b6f72480f94a1b3d97b722c63a464b14 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -911,7 +911,7 @@ static DetectRunScratchpad DetectRunSetup(
         }
         SCLogDebug("p->flowflags 0x%02x", p->flowflags);
 
-        if (p->flags & PKT_STREAM_EOF) {
+        if (p->flags & PKT_PSEUDO_STREAM_END) {
             flow_flags |= STREAM_EOF;
             SCLogDebug("STREAM_EOF set");
         }

diff --git a/src/flow-timeout.c b/src/flow-timeout.c
index 961a07bc40655349b82d73f5dfbc45df09f92a80..136fc31f7e721b9ca62f396d2cbc2c85c1603c1f 100644 (file)
--- a/src/flow-timeout.c
+++ b/src/flow-timeout.c
@@ -87,7 +87,6 @@ static inline Packet *FlowPseudoPacketSetup(
     p->proto = IPPROTO_TCP;
     FlowReference(&p->flow, f);
     p->flags |= PKT_STREAM_EST;
-    p->flags |= PKT_STREAM_EOF;
     p->flags |= PKT_HAS_FLOW;
     p->flags |= PKT_PSEUDO_STREAM_END;
     memcpy(&p->vlan_id[0], &f->vlan_id[0], sizeof(p->vlan_id));