diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-diffserv-mpls-common.c | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-diffserv-mpls-common.c')
| -rw-r--r-- | epan/dissectors/packet-diffserv-mpls-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 ++; |