From 3cc6957fa87021d1427a8c31fdfccaeb90188ebe Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sat, 26 Oct 2013 02:24:04 +0000 Subject: Bluetooth: Use items for logical block objects. Bug 9327 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) Bluetooth protocols use items, so dissect it to improve filtering and better user experience - text object cannot be filterable or comparable. From Michal Labedzki svn path=/trunk/; revision=52863 --- epan/dissectors/packet-btsap.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'epan/dissectors/packet-btsap.c') diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c index 0347972336..a3e45fc7e8 100644 --- a/epan/dissectors/packet-btsap.c +++ b/epan/dissectors/packet-btsap.c @@ -58,6 +58,7 @@ static int proto_btsap = -1; static int hf_btsap_header_msg_id = -1; static int hf_btsap_header_number_of_parameters = -1; static int hf_btsap_header_reserved = -1; +static int hf_btsap_parameter = -1; static int hf_btsap_parameter_id = -1; static int hf_btsap_parameter_reserved = -1; static int hf_btsap_parameter_length = -1; @@ -201,7 +202,9 @@ dissect_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, if (parameter_padding_length > 0) parameter_padding_length = 4 - parameter_padding_length; - parameter_item = proto_tree_add_text(tree, tvb, offset, 2 + 2 + parameter_length + parameter_padding_length, "Parameter: %s: ", val_to_str_const(parameter_id, parameter_id_vals, "Unknown ParameterID")); + parameter_item = proto_tree_add_none_format(tree, hf_btsap_parameter, tvb, offset, + 2 + 2 + parameter_length + parameter_padding_length, "Parameter: %s: ", + val_to_str_const(parameter_id, parameter_id_vals, "Unknown ParameterID")); ptree = proto_item_add_subtree(parameter_item, ett_btsap_parameter); proto_tree_add_item(ptree, hf_btsap_parameter_id, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -605,6 +608,11 @@ proto_register_btsap(void) FT_UINT16, BASE_HEX, NULL, 0x00, NULL, HFILL } }, + { &hf_btsap_parameter, + { "Parameter", "btsap.parameter", + FT_NONE, BASE_NONE, NULL, 0x00, + NULL, HFILL } + }, { &hf_btsap_parameter_id, { "Parameter ID", "btsap.parameter_id", FT_UINT8, BASE_HEX, VALS(parameter_id_vals), 0x00, -- cgit v1.2.3