From 877f38b46d0380d9804bbac805e6f02ffc95423a Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sat, 31 May 2014 11:00:30 +0200 Subject: make population id filterable Change-Id: I3381e1c35795ac33331cdddb8cefa8b0a16907cc Reviewed-on: https://code.wireshark.org/review/1894 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser --- epan/dissectors/packet-mpeg-descriptor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'epan') diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index e20c0a2e40..4ef9f330e2 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -1180,8 +1180,9 @@ proto_mpeg_descriptor_dissect_linkage(tvbuff_t *tvb, guint offset, guint len, pr population_id_base = tvb_get_ntohs(tvb, offset); population_id_mask = tvb_get_ntohs(tvb, offset + 2); - pi = proto_tree_add_string_format_value(tree, hf_mpeg_descr_linkage_population_id, tvb, offset, 4, "Population ID", "0x%04x/0x%04x", - population_id_base, population_id_mask); + pi = proto_tree_add_uint_format_value(tree, hf_mpeg_descr_linkage_population_id, tvb, offset, 4, + population_id_base<<16|population_id_mask, + "0x%04x / 0x%04x", population_id_base, population_id_mask); population_tree = proto_item_add_subtree(pi, ett_mpeg_descriptor_linkage_population_id); proto_tree_add_item(population_tree, hf_mpeg_descr_linkage_population_id_base, tvb, offset, 2, ENC_BIG_ENDIAN); @@ -3526,7 +3527,7 @@ proto_register_mpeg_descriptor(void) { &hf_mpeg_descr_linkage_population_id, { "Population ID", "mpeg_descr.population_id", - FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL + FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } }, { &hf_mpeg_descr_linkage_population_id_base, { -- cgit v1.2.1