Merge branch '4.5.0' into Feature_#796_nanosecond_packet_processing

appneta · Dec 26, 2023 · 6f65f71 · 6f65f71
2 parents dda4343 + 5fdcd2e
commit 6f65f71
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,4 +1,5 @@
 09/03/2023 Version 4.5.0-beta1
+    - handle IPv6 fragment extension header (#832 #837)
     - nanosecond timestamps (#796)
     - low PPS values run at full speed after several days (#779)
     - create DLT_LINUX_SLL2 plugin (#727)

diff --git a/docs/CREDIT b/docs/CREDIT
@@ -119,4 +119,7 @@ Bastian Triller <GitHub @btriller>
 
 GithHub @plangarbalint
     - eBPF
-    - nanosecond timers
+    - nanosecond timers
+
+Chuck Cottrill <GitHub @ChuckCottrill>
+    - handle IPv6 fragment extensions
diff --git a/src/common/get.c b/src/common/get.c
@@ -601,9 +601,25 @@ get_layer4_v6(const ipv6_hdr_t *ip6_hdr, const u_char *end_ptr)
             break;
 
         /*
-         * Can't handle.  Unparsable IPv6 fragment/encrypted data
+         * handle (unparsable) IPv6 fragment data
          */
         case TCPR_IPV6_NH_FRAGMENT:
+            // next points to l4 data
+            dbgx(3, "Go deeper due to fragment extension header 0x%02X", proto);
+            exthdr = get_ipv6_next(next, end_ptr);
+            if ((exthdr == NULL) || ((u_char *)exthdr > end_ptr)) {
+                next = NULL;
+                done = true;
+                break;
+            }
+            proto = exthdr->ip_nh;
+            next = exthdr;
+            // done = true;
+            break;
+
+        /*
+         * Can't handle.  Unparsable IPv6 encrypted data
+         */
         case TCPR_IPV6_NH_ESP:
             next = NULL;
             done = true;