Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update UDPCL #6

Merged
merged 5 commits into from
Dec 6, 2024
Merged

Update UDPCL #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
270ca90
Use bpv6 dissector explicitly.
BrianSipos Oct 21, 2021
df9fd8f
cache by branch name
BrianSipos Jan 21, 2023
3110074
Merge branch 'main' into ws-master-deps
BrianSipos Nov 22, 2024
794ca2c
Merge remote-tracking branch 'origin/main' into ws-master-deps
BrianSipos Dec 6, 2024
67c71fd
Fixing complaints from CMake
BrianSipos Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/wireshark-plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-

Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
1 change: 1 addition & 0 deletions src/packet-bpsec-cose.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/packet-udpcl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 */
Expand Down