diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 06:13:09 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 06:13:09 +0000 |
commit | 2ae1d08bbe6935cf856b766a4bd957868346cdc7 (patch) | |
tree | 9402a972f8bbc1e6829ebc59d5e95cd3643ce5c8 /epan/dissectors | |
parent | c2976ac50824db30343fa2cee70d05ac83423ef3 (diff) |
From Michal Labedzki:
Fix issues found by fix-encoding-args.pl
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304
svn path=/trunk/; revision=48388
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-btatt.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-btavrcp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-btbnep.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_cmd.c | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-bthci_evt.c | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-bthcrp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-btobex.c | 30 | ||||
-rw-r--r-- | epan/dissectors/packet-btsap.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-hci_usb.c | 2 |
9 files changed, 45 insertions, 45 deletions
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 368f4bcd0d..7d3f1aabf8 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -424,7 +424,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(ltree, hf_btatt_handle, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(ltree, hf_btatt_value, tvb, offset, length-2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ltree, hf_btatt_value, tvb, offset, length - 2, ENC_NA); offset += (length-2); } } @@ -488,7 +488,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 2; proto_tree_add_item(ltree, hf_btatt_group_end_handle, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - proto_tree_add_item(ltree, hf_btatt_value, tvb, offset, length-4, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ltree, hf_btatt_value, tvb, offset, length - 4, ENC_NA); offset += (length-4); } } diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 0b36b70b35..0ff80168ca 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -636,7 +636,7 @@ dissect_attribute_entries(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, offset += 2; proto_tree_add_item(entry_tree, hf_btavrcp_setting_value_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - proto_tree_add_item(entry_tree, hf_btavrcp_setting_value, tvb, offset, value_length, ENC_UTF_8); + proto_tree_add_item(entry_tree, hf_btavrcp_setting_value, tvb, offset, value_length, ENC_UTF_8 | ENC_NA); offset += value_length; } @@ -802,7 +802,7 @@ dissect_item_mediaplayer(tvbuff_t *tvb, proto_tree *tree, gint offset) displayable_name_length = tvb_get_ntohs(tvb, offset); offset += 2; - proto_tree_add_item(ptree, hf_btavrcp_displayable_name, tvb, offset, displayable_name_length, ENC_UTF_8); + proto_tree_add_item(ptree, hf_btavrcp_displayable_name, tvb, offset, displayable_name_length, ENC_UTF_8 | ENC_NA); offset += displayable_name_length; return offset; @@ -847,7 +847,7 @@ dissect_item_media_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, displayable_name_length = tvb_get_ntohs(tvb, offset); offset += 2; - proto_tree_add_item(ptree, hf_btavrcp_displayable_name, tvb, offset, displayable_name_length, ENC_UTF_8); + proto_tree_add_item(ptree, hf_btavrcp_displayable_name, tvb, offset, displayable_name_length, ENC_UTF_8 | ENC_NA); offset += displayable_name_length; proto_tree_add_item(ptree, hf_btavrcp_number_of_attributes, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -902,7 +902,7 @@ dissect_item_folder(tvbuff_t *tvb, proto_tree *tree, gint offset) displayable_name_length = tvb_get_ntohs(tvb, offset); offset += 2; - proto_tree_add_item(ptree, hf_btavrcp_displayable_name, tvb, offset, displayable_name_length, ENC_UTF_8); + proto_tree_add_item(ptree, hf_btavrcp_displayable_name, tvb, offset, displayable_name_length, ENC_UTF_8 | ENC_NA); offset += displayable_name_length; return offset; @@ -1399,7 +1399,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, attribute_name_length = tvb_get_ntohs(tvb, offset); offset += 1; - proto_tree_add_item(tree, hf_btavrcp_attribute_name, tvb, offset, attribute_name_length, ENC_UTF_8); + proto_tree_add_item(tree, hf_btavrcp_attribute_name, tvb, offset, attribute_name_length, ENC_UTF_8 | ENC_NA); offset += attribute_name_length; } } @@ -1439,7 +1439,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, attribute_value_length = tvb_get_ntohs(tvb, offset); offset += 1; - proto_tree_add_item(tree, hf_btavrcp_attribute_value, tvb, offset, attribute_value_length, ENC_UTF_8); + proto_tree_add_item(tree, hf_btavrcp_attribute_value, tvb, offset, attribute_value_length, ENC_UTF_8 | ENC_NA); offset += attribute_value_length; } } diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index acb99caebe..b067abdd45 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -170,12 +170,12 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) uuid_size = tvb_get_guint8(tvb, offset); offset += 1; - pitem = proto_tree_add_item(tree, hf_btbnep_destination_service_uuid, tvb, offset, uuid_size, ENC_BIG_ENDIAN); + pitem = proto_tree_add_item(tree, hf_btbnep_destination_service_uuid, tvb, offset, uuid_size, ENC_NA); uuid_dst = tvb_get_ntohs(tvb, offset); proto_item_append_text(pitem, " (%s)", val_to_str_ext(uuid_dst, &vs_service_classes_ext, "Unknown uuid")); offset += uuid_size; - pitem = proto_tree_add_item(tree, hf_btbnep_source_service_uuid, tvb, offset, uuid_size, ENC_BIG_ENDIAN); + pitem = proto_tree_add_item(tree, hf_btbnep_source_service_uuid, tvb, offset, uuid_size, ENC_NA); uuid_src = tvb_get_ntohs(tvb, offset); proto_item_append_text(pitem, " (%s)", val_to_str_ext(uuid_src, &vs_service_classes_ext, "Unknown uuid")); offset += uuid_size; @@ -217,10 +217,10 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) offset += 2; for (i_item = 0; i_item < list_length; i_item += 12) { - proto_tree_add_item(tree, hf_btbnep_multicast_address_start, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_btbnep_multicast_address_start, tvb, offset, 6, ENC_NA); offset += 6; - proto_tree_add_item(tree, hf_btbnep_multicast_address_end, tvb, offset, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_btbnep_multicast_address_end, tvb, offset, 6, ENC_NA); offset += 6; } break; diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 0768ae6042..9a7882c090 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -1259,7 +1259,7 @@ dissect_bthci_eir_ad_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t proto_tree_add_item(ti_data_struct_subtree, hf_bthci_cmd_hash_c, tvb, offset+i+2, 16, ENC_NA); break; case 0x0F: /* Simple Pairing Randomizer R */ - proto_tree_add_item(ti_data_struct_subtree, hf_bthci_cmd_randomizer_r, tvb, offset+i+2, 16, ENC_NA); + proto_tree_add_item(ti_data_struct_subtree, hf_bthci_cmd_randomizer_r, tvb, offset + i + 2, 16, ENC_NA); break; case 0x11: /* Security Manager OOB Flags */ proto_tree_add_item(ti_data_struct_subtree, hf_bthci_cmd_flags_le_oob_data_present, tvb, offset+i+2, 1, ENC_LITTLE_ENDIAN); @@ -1296,7 +1296,7 @@ dissect_bthci_eir_ad_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t break; } default: - proto_tree_add_item(ti_data_struct_subtree, hf_bthci_cmd_eir_data, tvb, offset+i+2, length-1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_data_struct_subtree, hf_bthci_cmd_eir_data, tvb, offset + i + 2, length - 1, ENC_NA); break; } i += length+1; @@ -1612,9 +1612,9 @@ dissect_link_control_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr case 0x0030: /* Remote OOB Data Request Reply */ offset = dissect_bthci_cmd_bd_addr(tvb, offset, pinfo, tree); - proto_tree_add_item(tree, hf_bthci_cmd_hash_c, tvb, offset, 16, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_cmd_hash_c, tvb, offset, 16, ENC_NA); offset+=16; - proto_tree_add_item(tree, hf_bthci_cmd_randomizer_r, tvb, offset, 16, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_cmd_randomizer_r, tvb, offset, 16, ENC_NA); offset+=16; break; @@ -2269,9 +2269,9 @@ dissect_host_controller_baseband_cmd(tvbuff_t *tvb, int offset, packet_info *pin case 0x0065: /* Write Location Data */ proto_tree_add_item(tree, hf_bthci_cmd_location_domain_aware, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_bthci_cmd_location_domain, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_cmd_location_domain, tvb, offset, 2, ENC_ASCII | ENC_NA); offset+=2; - proto_tree_add_item(tree, hf_bthci_cmd_location_domain_options, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_cmd_location_domain_options, tvb, offset, 1, ENC_ASCII | ENC_NA); offset++; proto_tree_add_item(tree, hf_bthci_cmd_location_options, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; @@ -2571,7 +2571,7 @@ dissect_le_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, break; case 0x0014: /* LE Set Host Channel Classification */ - proto_tree_add_item(tree, hf_bthci_cmd_le_channel_map, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_cmd_le_channel_map, tvb, offset, 2, ENC_NA); offset+=5; break; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 88cc25c3ba..00dd5f8b7c 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -1674,7 +1674,7 @@ dissect_bthci_evt_eir_ad_data(tvbuff_t *tvb, int offset, packet_info *pinfo, } case 0x16: /* Service Data */ proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_sc_uuid16, tvb, offset+i+2, 2, ENC_LITTLE_ENDIAN); - proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_data, tvb, offset+i+4, length-3, ENC_LITTLE_ENDIAN); + proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_data, tvb, offset + i + 4, length - 3, ENC_NA); break; case 0x17: /* Public Target Address */ case 0x18: /* Random Target Address */ @@ -1695,7 +1695,7 @@ dissect_bthci_evt_eir_ad_data(tvbuff_t *tvb, int offset, packet_info *pinfo, break; } default: - proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_data, tvb, offset+i+2, length-1, ENC_NA); + proto_tree_add_item(ti_eir_struct_subtree, hf_bthci_evt_data, tvb, offset + i + 2, length - 1, ENC_NA); break; } i += length+1; @@ -1854,7 +1854,7 @@ dissect_bthci_evt_le_meta(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t offset++; offset = dissect_bthci_evt_bd_addr(tvb, offset, pinfo, tree, NULL); length = tvb_get_guint8(tvb, offset); - proto_tree_add_item(tree, hf_bthci_evt_data_length, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_evt_data_length, tvb, offset, 1, ENC_NA); offset++; offset=dissect_bthci_evt_eir_ad_data(tvb, offset, pinfo, tree, length, NULL); proto_tree_add_item(tree, hf_bthci_evt_rssi, tvb, offset, 1, ENC_LITTLE_ENDIAN); @@ -2614,9 +2614,9 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, packet_info *pinfo offset++; proto_tree_add_item(tree, hf_bthci_evt_location_domain_aware, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_bthci_evt_location_domain, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_evt_location_domain, tvb, offset, 2, ENC_ASCII | ENC_NA); offset+=2; - proto_tree_add_item(tree, hf_bthci_evt_location_domain_options, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_evt_location_domain_options, tvb, offset, 1, ENC_ASCII | ENC_NA); offset++; proto_tree_add_item(tree, hf_bthci_evt_location_options, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; @@ -2935,7 +2935,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, packet_info *pinfo offset++; proto_tree_add_item(tree, hf_bthci_evt_connection_handle, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset+=2; - proto_tree_add_item(tree, hf_bthci_evt_le_channel_map, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_evt_le_channel_map, tvb, offset, 1, ENC_NA); offset+=5; break; } @@ -2944,7 +2944,7 @@ dissect_bthci_evt_command_complete(tvbuff_t *tvb, int offset, packet_info *pinfo { proto_tree_add_item(tree, hf_bthci_evt_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); offset++; - proto_tree_add_item(tree, hf_bthci_evt_encrypted_data, tvb, offset, 16, ENC_LITTLE_ENDIAN); + proto_tree_add_item(tree, hf_bthci_evt_encrypted_data, tvb, offset, 16, ENC_NA); offset+=16; break; } diff --git a/epan/dissectors/packet-bthcrp.c b/epan/dissectors/packet-bthcrp.c index f859b48bd9..65feaa03af 100644 --- a/epan/dissectors/packet-bthcrp.c +++ b/epan/dissectors/packet-bthcrp.c @@ -231,7 +231,7 @@ dissect_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else { guint8 *id; - proto_tree_add_item(tree, hf_bthcrp_control_1284_id, tvb, offset, -1, ENC_NA); + proto_tree_add_item(tree, hf_bthcrp_control_1284_id, tvb, offset, -1, ENC_ASCII | ENC_NA); id = tvb_get_string(tvb, offset, tvb_length_remaining(tvb, offset)); col_append_fstr(pinfo->cinfo, COL_INFO, " - 1284 ID: %s", id); offset += tvb_length_remaining(tvb, offset); diff --git a/epan/dissectors/packet-btobex.c b/epan/dissectors/packet-btobex.c index 93fdfa4a6a..f3a0d06bd9 100644 --- a/epan/dissectors/packet-btobex.c +++ b/epan/dissectors/packet-btobex.c @@ -642,7 +642,7 @@ dissect_raw_application_parameters(tvbuff_t *tvb, proto_tree *tree, gint offset, offset += 1; proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, - parameter_length, ENC_BIG_ENDIAN); + parameter_length, ENC_NA); parameters_length -= 2 + parameter_length; offset += parameter_length; @@ -677,7 +677,7 @@ dissect_bpp_application_parameters(tvbuff_t *tvb, packet_info *pinfo, offset += 1; if (parameter_length != 4) { - item = proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + item = proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_NA); expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "According to the specification this parameter length should be 4, but there is %i", parameter_length); } else switch (parameter_id) { @@ -694,7 +694,7 @@ dissect_bpp_application_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(parameter_tree, hf_bpp_application_parameter_data_file_size, tvb, offset, 4, ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_NA); } parameters_length -= 2 + parameter_length; @@ -732,7 +732,7 @@ dissect_bip_application_parameters(tvbuff_t *tvb, packet_info *pinfo, if (parameter_id < (sizeof(required_length_map)/sizeof(gint)) && required_length_map[parameter_id] != parameter_length) { - item = proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + item = proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_NA); expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "According to the specification this parameter length should be %i, but there is %i", required_length_map[parameter_id], parameter_length); @@ -768,7 +768,7 @@ dissect_bip_application_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(parameter_tree, hf_bip_application_parameter_data_store_flag, tvb, offset, required_length_map[parameter_id], ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_NA); } parameters_length -= 2 + parameter_length; @@ -807,7 +807,7 @@ dissect_pbap_application_parameters(tvbuff_t *tvb, packet_info *pinfo, if (parameter_id < (sizeof(required_length_map)/sizeof(gint)) && required_length_map[parameter_id] != -1 && required_length_map[parameter_id] != parameter_length) { - item = proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + item = proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_NA); expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "According to the specification this parameter length should be %i, but there is %i", required_length_map[parameter_id], parameter_length); @@ -816,7 +816,7 @@ dissect_pbap_application_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_order, tvb, offset, required_length_map[parameter_id], ENC_BIG_ENDIAN); break; case 0x02: - proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_search_value, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_search_value, tvb, offset, parameter_length, ENC_ASCII | ENC_NA); break; case 0x03: proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_search_attribute, tvb, offset, required_length_map[parameter_id], ENC_BIG_ENDIAN); @@ -873,7 +873,7 @@ dissect_pbap_application_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(parameter_tree, hf_pbap_application_parameter_data_new_missed_calls, tvb, offset, required_length_map[parameter_id], ENC_BIG_ENDIAN); break; default: - proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_NA); } parameters_length -= 2 + parameter_length; @@ -912,7 +912,7 @@ dissect_map_application_parameters(tvbuff_t *tvb, packet_info *pinfo, if (parameter_id < (sizeof(required_length_map)/sizeof(gint)) && required_length_map[parameter_id] != -1 && required_length_map[parameter_id] != parameter_length) { - item = proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + item = proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_NA); expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "According to the specification this parameter length should be %i, but there is %i", required_length_map[parameter_id], parameter_length); @@ -931,10 +931,10 @@ dissect_map_application_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_message_type_sms_gsm, tvb, offset, required_length_map[parameter_id], ENC_BIG_ENDIAN); break; case 0x04: - proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_period_begin, tvb, offset, parameter_length, ENC_NA); + proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_period_begin, tvb, offset, parameter_length, ENC_ASCII | ENC_NA); break; case 0x05: - proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_period_end, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_period_end, tvb, offset, parameter_length, ENC_ASCII | ENC_NA); break; case 0x06: proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_read_status_reserved_6, tvb, offset, required_length_map[parameter_id], ENC_BIG_ENDIAN); @@ -942,10 +942,10 @@ dissect_map_application_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_read_status_get_unread, tvb, offset, required_length_map[parameter_id], ENC_BIG_ENDIAN); break; case 0x07: - proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_recipient, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_recipient, tvb, offset, parameter_length, ENC_ASCII | ENC_NA); break; case 0x08: - proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_originator, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_originator, tvb, offset, parameter_length, ENC_ASCII | ENC_NA); break; case 0x09: proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_filter_priority_reserved_6, tvb, offset, required_length_map[parameter_id], ENC_BIG_ENDIAN); @@ -1025,10 +1025,10 @@ dissect_map_application_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_status_value, tvb, offset, required_length_map[parameter_id], ENC_BIG_ENDIAN); break; case 0x19: - proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_mse_time, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_map_application_parameter_data_mse_time, tvb, offset, parameter_length, ENC_ASCII | ENC_NA); break; default: - proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_BIG_ENDIAN); + proto_tree_add_item(parameter_tree, hf_application_parameter_data, tvb, offset, parameter_length, ENC_NA); } parameters_length -= 2 + parameter_length; diff --git a/epan/dissectors/packet-btsap.c b/epan/dissectors/packet-btsap.c index 6a20549806..5595cb2efb 100644 --- a/epan/dissectors/packet-btsap.c +++ b/epan/dissectors/packet-btsap.c @@ -364,7 +364,7 @@ dissect_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *top_tree, proto offset += parameter_length; if (parameter_padding_length > 0) { - pitem = proto_tree_add_item(ptree, hf_btsap_parameter_padding, tvb, offset, parameter_padding_length, ENC_BIG_ENDIAN); + pitem = proto_tree_add_item(ptree, hf_btsap_parameter_padding, tvb, offset, parameter_padding_length, ENC_NA); proto_item_append_text(pitem, " (length %d)", parameter_padding_length); offset += parameter_padding_length; } @@ -413,7 +413,7 @@ dissect_btsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } - ti = proto_tree_add_item(tree, proto_btsap, tvb, offset, -1, FALSE); + ti = proto_tree_add_item(tree, proto_btsap, tvb, offset, -1, ENC_NA); btsap_tree = proto_item_add_subtree(ti, ett_btsap); proto_tree_add_item(btsap_tree, hf_btsap_header_msg_id, tvb, offset, 1, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index 41c78bdc3b..111472c37a 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -211,7 +211,7 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (usb_data->endpoint == 0x03) { call_dissector(find_dissector("bthci_sco"), next_tvb, pinfo, tree); } else if (usb_data->endpoint > 0x03) { - proto_tree_add_item(ttree, hf_bthci_usb_data, tvb, offset, -1, ENC_BIG_ENDIAN); + proto_tree_add_item(ttree, hf_bthci_usb_data, tvb, offset, -1, ENC_NA); } offset += tvb_length_remaining(tvb, offset); |