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 e02cd9c073a088d2b7ad0aae3ca452f563357bbd..6b17f90738456241ac262f6fab34e009215749f1 100644 (file)
--- 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;