From e126602f2e3622bc3863065e1ee4553446c7e2a0 Mon Sep 17 00:00:00 2001
From: Brian Sipos <brian.sipos@jhuapl.edu>
Date: Fri, 6 Dec 2024 15:37:53 -0500
Subject: [PATCH] Update UDPCL (#6)

* Use bpv6 dissector explicitly

* Fixing complaints from CMake
---
 .github/workflows/wireshark-plugin.yml | 2 +-
 CMakeLists.txt                         | 3 ++-
 src/packet-bpsec-cose.c                | 1 +
 src/packet-udpcl.c                     | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/wireshark-plugin.yml b/.github/workflows/wireshark-plugin.yml
index 545c361..3e4a661 100644
--- 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
index dd332d0..41f0944 100644
--- 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
index 4039227..209cd5d 100644
--- 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
index c066e88..3048c73 100644
--- 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 */