diff options
| author | Michael Mann <mmann78@netscape.net> | 2012-09-27 16:49:31 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2012-09-27 16:49:31 +0000 |
| commit | 99d0404b737d7779f8bbd46aa8626a3a8a09cd0a (patch) | |
| tree | c76de43482274c70a994b55840655382def65b13 /epan/dissectors/packet-q931.c | |
| parent | 3b6428bb443db6817a31ead0c53f294b771f1962 (diff) | |
replaced decode_enumerated_bitfield calls with itemized filters
svn path=/trunk/; revision=45176
Diffstat (limited to 'epan/dissectors/packet-q931.c')
| -rw-r--r-- | epan/dissectors/packet-q931.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index dd94923d85..b65c9de349 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -84,6 +84,8 @@ static int hf_q931_cause_value = -1; static int hf_q931_number_type = -1; static int hf_q931_numbering_plan = -1; static int hf_q931_extension_ind = -1; +static int hf_q931_extension_ind_preference = -1; +static int hf_q931_extension_ind_new_status = -1; static int hf_q931_calling_party_number = -1; static int hf_q931_called_party_number = -1; static int hf_q931_connected_number = -1; @@ -1444,10 +1446,8 @@ dissect_q931_change_status_ie(tvbuff_t *tvb, int offset, int len _U_, proto_tree octet = tvb_get_guint8(tvb, offset); proto_tree_add_item(tree, hf_q931_extension_ind, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_text(tree, tvb, offset, 1, "%s", - decode_enumerated_bitfield_shifted(octet, 0x40, 8, VALS(q931_status_preference_vals), "Preference: %s")); - proto_tree_add_text(tree, tvb, offset, 1, "%s", - decode_enumerated_bitfield(octet, 0x07, 8, VALS(q931_new_status_vals), "New status: %s")); + proto_tree_add_item(tree, hf_q931_extension_ind_preference, tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_q931_extension_ind_new_status, tvb, offset, 1, ENC_BIG_ENDIAN); } /* @@ -3448,6 +3448,16 @@ proto_register_q931(void) FT_BOOLEAN, 8, TFS(&q931_extension_ind_value), 0x80, NULL, HFILL }}, + { &hf_q931_extension_ind_preference, + { "Preference", "q931.extension_ind_preference", + FT_UINT8, BASE_DEC, VALS(q931_status_preference_vals), 0x40, + NULL, HFILL }}, + + { &hf_q931_extension_ind_new_status, + { "New status", "q931.extension_ind_new_status", + FT_UINT8, BASE_DEC, VALS(q931_new_status_vals), 0x07, + NULL, HFILL }}, + { &hf_q931_calling_party_number, { "Calling party number digits", "q931.calling_party_number.digits", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, |