Update UDPCL (#6)

* Use bpv6 dissector explicitly * Fixing complaints from CMake
BrianSipos · Dec 6, 2024 · e126602 · e126602
1 parent b3cddad
commit e126602
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/wireshark-plugin.yml b/.github/workflows/wireshark-plugin.yml
@@ -24,7 +24,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ env.CCACHE_DIR }}
-        key: ubuntu-ccache-${{ github.sha }}
+        key: ubuntu-ccache-${{ github.ref_name }}
         restore-keys: |
           ubuntu-ccache-
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,11 @@
+cmake_minimum_required(VERSION 3.10)
 cmake_policy(VERSION 3.10)
+
 project(
     dtn-wireshark
     LANGUAGES C CXX
     VERSION 0.0
 )
-cmake_minimum_required(VERSION 3.10)
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type")

diff --git a/src/packet-bpsec-cose.c b/src/packet-bpsec-cose.c
@@ -94,6 +94,7 @@ static int dissect_param_scope(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
             proto_tree_add_cbor_bitmask(tree_blknum, hf_aad_flags, ett_aad_flags, aad_flags, pinfo, tvb, chunk_flags, flags);
         }
     }
+    proto_item_set_len(item_aad_map, offset);
 
     return offset;
 }

diff --git a/src/packet-udpcl.c b/src/packet-udpcl.c
@@ -7,12 +7,12 @@
 #include <epan/dissectors/packet-udp.h>
 #include <epan/dissectors/packet-dtls.h>
 #include <epan/exceptions.h>
+#include <epan/wscbor.h>
 #include <wsutil/wmem/wmem_map.h>
 #include <wsutil/wmem/wmem_tree.h>
 #include <wsutil/wmem/wmem_interval_tree.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include "epan/wscbor.h"
 
 #if defined(WIRESHARK_HAS_VERSION_H)
 #include <ws_version.h>
@@ -925,7 +925,7 @@ static void proto_reg_handoff_udpcl(void) {
 
     handle_cbor = find_dissector("cbor");
     handle_dtls = find_dissector_add_dependency(DTLS_DISSECTOR_NAME, proto_udpcl);
-    handle_bpv6 = find_dissector_add_dependency("bundle", proto_udpcl);
+    handle_bpv6 = find_dissector_add_dependency("bpv6", proto_udpcl);
     handle_bpv7 = find_dissector_add_dependency("bpv7", proto_udpcl);
 
     /* Packaged extensions */
-Original file line number
+Diff line change
@@ Expand Up @@
                 proto_tree_add_cbor_bitmask(tree_blknum, hf_aad_flags, ett_aad_flags, aad_flags, pinfo, tvb, chunk_flags, flags);
             }
         }
+        proto_item_set_len(item_aad_map, offset);
         return offset;
     }
@@ Expand Down @@