aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2017-11-13 21:58:33 +0100
committerAnders Broman <a.broman58@gmail.com>2017-11-13 22:45:15 +0000
commita595d7326b4a42f15a7b3109a6e81b4de02bbc14 (patch)
tree785fef0421f3e78aa5645e583204a8c3311f67b1
parentb1302f0f28e8af4f3b3f47bd0a6962e514af7b56 (diff)
MPLS: use directly proto_tree_add_item for display PW ACH Channel Type
Ping-Bug 14208 Change-Id: Idefa2611fd6725b65c1994ef1f4ff4b00fcf67c7 Reviewed-on: https://code.wireshark.org/review/24403 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-mpls.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index d164f756a1..06aaf27a5b 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -282,11 +282,8 @@ dissect_pw_ach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _
if (res != 0)
expert_add_info(pinfo, ti, &ei_mpls_pw_ach_res);
- proto_tree_add_uint_format_value(mpls_pw_ach_tree, hf_mpls_pw_ach_channel_type,
- tvb, 2, 2, channel_type,
- "%s (0x%04x)",
- val_to_str_ext_const(channel_type, &mpls_pwac_types_ext, "Unknown"),
- channel_type);
+ proto_tree_add_item(mpls_pw_ach_tree, hf_mpls_pw_ach_channel_type,
+ tvb, 2, 2, ENC_BIG_ENDIAN);
} /* if (tree) */
@@ -580,7 +577,7 @@ proto_register_mpls(void)
{&hf_mpls_pw_ach_channel_type,
{"Channel Type", "pwach.channel_type",
- FT_UINT16, BASE_HEX, NULL, 0x0,
+ FT_UINT16, BASE_HEX|BASE_EXT_STRING, &mpls_pwac_types_ext, 0x0,
"PW Associated Channel Type", HFILL }
},