From: Victor Julien <vjulien@oisf.net>
Date: Sun, 3 Dec 2023 20:15:36 +0000 (+0100)
Subject: defrag: match up v4 and v6 packet setup
X-Git-Tag: suricata-6.0.19~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5950fe2cdaa369fee36de78ddde1a0e13a6ed495;p=thirdparty%2Fsuricata.git

defrag: match up v4 and v6 packet setup

v4 was doing redundant recursion level setup.

v6 was missing PKT_REBUILT_FRAGMENT flag.

(cherry picked from commit af97316f42c6616536dc8012577827fee9a56f11)
---

diff --git a/src/defrag.c b/src/defrag.c
index e02cd9c073..6b17f90738 100644
--- a/src/defrag.c
+++ b/src/defrag.c
@@ -295,7 +295,6 @@ Defrag4Reassemble(ThreadVars *tv, DefragTracker *tracker, Packet *p)
     }
     PKT_SET_SRC(rp, PKT_SRC_DEFRAG);
     rp->flags |= PKT_REBUILT_FRAGMENT;
-    rp->recursion_level = p->recursion_level;
 
     int fragmentable_offset = 0;
     int fragmentable_len = 0;
@@ -433,6 +432,7 @@ Defrag6Reassemble(ThreadVars *tv, DefragTracker *tracker, Packet *p)
         goto error_remove_tracker;
     }
     PKT_SET_SRC(rp, PKT_SRC_DEFRAG);
+    rp->flags |= PKT_REBUILT_FRAGMENT;
 
     int unfragmentable_len = 0;
     int fragmentable_offset = 0;