decode/tunnel: move tunnel verdicted logic

In preparation of cleaning up thread safety, move "verdicted"
logic out of Packet::flags. Unsafe writes to "flags" can potentially
have side effects.

diff --git a/src/decode.h b/src/decode.h
index 22a512b93573c73525c78a9fa4b85a9fad55f230..fc5b9a074443f8d231b65c624cae752a43f3162e 100644 (file)
--- a/src/decode.h
+++ b/src/decode.h
@@ -618,6 +618,9 @@ typedef struct Packet_
     /* enum PacketDropReason::PKT_DROP_REASON_* as uint8_t for compactness */
     uint8_t drop_reason;
 
+    /* has tunnel been verdicted? */
+    bool tunnel_verdicted;
+
     /* tunnel/encapsulation handling */
     struct Packet_ *root; /* in case of tunnel this is a ptr
                            * to the 'real' packet, the one we
@@ -801,8 +804,8 @@ static inline void TUNNEL_INCR_PKT_TPR(Packet *p)
 #define UNSET_TUNNEL_PKT(p)         ((p)->flags &= ~PKT_TUNNEL)
 #define IS_TUNNEL_ROOT_PKT(p)       (IS_TUNNEL_PKT(p) && (p)->root == NULL)
 
-#define IS_TUNNEL_PKT_VERDICTED(p)  (((p)->flags & PKT_TUNNEL_VERDICTED))
-#define SET_TUNNEL_PKT_VERDICTED(p) ((p)->flags |= PKT_TUNNEL_VERDICTED)
+#define IS_TUNNEL_PKT_VERDICTED(p)  (p)->tunnel_verdicted
+#define SET_TUNNEL_PKT_VERDICTED(p) (p)->tunnel_verdicted = true
 
 enum DecodeTunnelProto {
     DECODE_TUNNEL_ETHERNET,
@@ -1015,7 +1018,7 @@ void DecodeUnregisterCounters(void);
 #define PKT_STREAM_NOPCAPLOG BIT_U32(12)
 
 #define PKT_TUNNEL           BIT_U32(13)
-#define PKT_TUNNEL_VERDICTED BIT_U32(14)
+// vacancy
 
 /** Packet checksum is not computed (TX packet for example) */
 #define PKT_IGNORE_CHECKSUM BIT_U32(15)

diff --git a/src/packet.c b/src/packet.c
index 40f3bdfcf385a2277bdc7ea387d4a6739dd04f35..c798a0d11ea00ca31ac91d65d5b3ef9a576effcf 100644 (file)
--- a/src/packet.c
+++ b/src/packet.c
@@ -157,6 +157,7 @@ void PacketReinit(Packet *p)
     AppLayerDecoderEventsResetEvents(p->app_layer_events);
     p->next = NULL;
     p->prev = NULL;
+    p->tunnel_verdicted = false;
     p->root = NULL;
     p->livedev = NULL;
     PACKET_RESET_CHECKSUMS(p);