diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-25 18:56:16 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-26 02:15:24 +0000 |
| commit | 904e1b4dafa6287f763a9004361e5725ae769758 (patch) | |
| tree | 9e12205a10a5451de38267b850192b4fe429ff9c | |
| parent | a77290cea14be402ef09074ffa45300d07e081c2 (diff) | |
| download | wireshark-904e1b4dafa6287f763a9004361e5725ae769758.tar.gz | |
ISUP: fix a wrong removal of proto_tree_add_text()
Bug: 11768
Change-Id: I42199f391f6559de88ce37104bd74a9f4be77e09
Reviewed-on: https://code.wireshark.org/review/12149
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit b1044d6553241aa10189ff1fc064702c767a09b8)
Reviewed-on: https://code.wireshark.org/review/12163
| -rw-r--r-- | epan/dissectors/packet-isup.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index c323476e48..522ee0b357 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -6371,23 +6371,15 @@ dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *para &hf_isup_screening_indicator, NULL }; - static const int * indicators2_fields_gfe[] = { - &hf_isup_inn_indicator, - &hf_isup_numbering_plan_indicator, - &hf_isup_number_different_meaning, - &hf_isup_address_presentation_restricted_indicator, - &hf_isup_screening_indicator, - NULL - }; proto_tree_add_bitmask_list(parameter_tree, parameter_tvb, 0, 1, indicators1_fields, ENC_NA); indicators1 = tvb_get_guint8(parameter_tvb, 0); indicators2 = tvb_get_guint8(parameter_tvb, 1); if ((indicators2 & GFE_8BIT_MASK) == 0x50) { - proto_tree_add_bitmask_list(parameter_tree, parameter_tvb, 1, 1, indicators2_fields_gfe, ENC_NA); - } else { - proto_tree_add_bitmask_list(parameter_tree, parameter_tvb, 1, 1, indicators2_fields, ENC_NA); + proto_tree_add_uint_format_value(parameter_tree, hf_isup_number_different_meaning, parameter_tvb, 1, 1, indicators2 & GFE_8BIT_MASK, + "Numbering plan indicator = private numbering plan"); } + proto_tree_add_bitmask_list(parameter_tree, parameter_tvb, 1, 1, indicators2_fields, ENC_NA); /* NOTE When the address presentation restricted indicator indicates address not available, the * subfields in items a), b), c) and d) are coded with 0's, and the screening indicator is set to 11 |