From 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:33 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-diffserv-mpls-common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-diffserv-mpls-common.c') diff --git a/epan/dissectors/packet-diffserv-mpls-common.c b/epan/dissectors/packet-diffserv-mpls-common.c index bbfde452..f4add8a4 100644 --- a/epan/dissectors/packet-diffserv-mpls-common.c +++ b/epan/dissectors/packet-diffserv-mpls-common.c @@ -45,12 +45,12 @@ const value_string phbid_bit15_vals[] = { void dissect_diffserv_mpls_common(tvbuff_t *tvb, proto_tree *tree, int type, - int offset, int **hfindexes, gint **etts) + int offset, int **hfindexes, int **etts) { proto_item *ti = NULL, *sub_ti; proto_tree *tree2 = NULL, *phbid_subtree; int exp; - guint16 phbid; + uint16_t phbid; switch (type) { case 1: /* E-LSP */ @@ -58,7 +58,7 @@ dissect_diffserv_mpls_common(tvbuff_t *tvb, proto_tree *tree, int type, tree2 = proto_item_add_subtree(ti, ett_map); proto_item_set_text(ti, "MAP: "); offset ++; - exp = tvb_get_guint8(tvb, offset) & 7; + exp = tvb_get_uint8(tvb, offset) & 7; proto_tree_add_uint(tree2, hf_exp, tvb, offset, 1, exp); proto_item_append_text(ti, "EXP %u, ", exp); offset ++; -- cgit v1.2.3