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 65572cff5632cbe1c6953c866474ecbc04d5c21c..c3f4708a2b9a832cc21954660fb4fd2a312709a0 100644 (file)
--- 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;
 }