From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Tue, 16 Nov 2021 00:46:54 +0000 (+0000)
Subject: Pull request #3165: detection: ensure PDUs indicate parent when available
X-Git-Tag: 3.1.17.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bb8e9041f0c18e751dbc5a37fd4a98e68b19f10;p=thirdparty%2Fsnort3.git

Pull request #3165: detection: ensure PDUs indicate parent when available

Merge in SNORT/snort3 from ~RUCOMBS/snort3:packet_parent to master

Squashed commit of the following:

commit 75d45c3311339e0550b5262bf907ccecf4c3f2f4
Author: russ <rucombs@cisco.com>
Date:   Sun Nov 14 07:36:43 2021 -0500

    detection: ensure PDUs indicate parent when available
---

diff --git a/src/detection/detection_engine.cc b/src/detection/detection_engine.cc
index 65572cff5..c3f4708a2 100644
--- a/src/detection/detection_engine.cc
+++ b/src/detection/detection_engine.cc
@@ -202,10 +202,11 @@ Packet* DetectionEngine::set_next_packet(Packet* parent, Flow* flow)
         shutdown_active.reset();
     }
 
+    p->reset();
+
     if ( parent )
         p->packet_flags |= PKT_HAS_PARENT;
 
-    p->reset();
     return p;
 }