diff options
Diffstat (limited to 'epan/dissectors/packet-btavrcp.c')
| -rw-r--r-- | epan/dissectors/packet-btavrcp.c | 394 |
1 files changed, 197 insertions, 197 deletions
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 570b807aa5..6c8660c0ed 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -22,187 +22,187 @@ #include "packet-btavctp.h" #include "packet-btavrcp.h" -static int proto_btavrcp = -1; - -static int hf_btavrcp_rfa = -1; -static int hf_btavrcp_ctype = -1; -static int hf_btavrcp_subunit_type = -1; -static int hf_btavrcp_subunit_id = -1; -static int hf_btavrcp_opcode = -1; -static int hf_btavrcp_company_id = -1; -static int hf_btavrcp_length = -1; -static int hf_btavrcp_pdu_id = -1; -static int hf_btavrcp_bt_pdu_id = -1; -static int hf_btavrcp_bt_continuing_pdu_id = -1; -static int hf_btavrcp_browsing_pdu_id = -1; -static int hf_btavrcp_reserved = -1; -static int hf_btavrcp_packet_type = -1; -static int hf_btavrcp_passthrough_state = -1; -static int hf_btavrcp_passthrough_operation = -1; -static int hf_btavrcp_passthrough_data_length = -1; -static int hf_btavrcp_passthrough_company_id = -1; -static int hf_btavrcp_passthrough_vendor_unique_id = -1; -static int hf_btavrcp_unit_unknown = -1; -static int hf_btavrcp_unit_type = -1; -static int hf_btavrcp_unit_id = -1; -static int hf_btavrcp_subunit_page = -1; -static int hf_btavrcp_subunit_extension_code = -1; -static int hf_btavrcp_item = -1; -static int hf_btavrcp_folder = -1; -static int hf_btavrcp_player_id = -1; -static int hf_btavrcp_status = -1; -static int hf_btavrcp_uid_counter = -1; -static int hf_btavrcp_number_of_items = -1; -static int hf_btavrcp_number_of_items16 = -1; -static int hf_btavrcp_character_set = -1; -static int hf_btavrcp_folder_depth = -1; -static int hf_btavrcp_folder_name_length = -1; -static int hf_btavrcp_folder_name = -1; -static int hf_btavrcp_search = -1; -static int hf_btavrcp_search_length = -1; -static int hf_btavrcp_number_of_attributes = -1; -static int hf_btavrcp_uid = -1; -static int hf_btavrcp_scope = -1; -static int hf_btavrcp_start_item = -1; -static int hf_btavrcp_end_item = -1; -static int hf_btavrcp_direction = -1; -static int hf_btavrcp_identifier = -1; -static int hf_btavrcp_song_length = -1; -static int hf_btavrcp_song_position = -1; -static int hf_btavrcp_play_status = -1; -static int hf_btavrcp_notification_interval = -1; -static int hf_btavrcp_event_id = -1; -static int hf_btavrcp_battery_status = -1; -static int hf_btavrcp_number_of_character_set = -1; -static int hf_btavrcp_absolute_volume_rfa = -1; -static int hf_btavrcp_absolute_volume = -1; -static int hf_btavrcp_capability = -1; -static int hf_btavrcp_capability_count = -1; -static int hf_btavrcp_item_type = -1; -static int hf_btavrcp_item_length = -1; -static int hf_btavrcp_system_status = -1; -static int hf_btavrcp_number_of_settings = -1; -static int hf_btavrcp_settings_attribute = -1; -static int hf_btavrcp_settings_value = -1; -static int hf_btavrcp_displayable_name = -1; -static int hf_btavrcp_displayable_name_length = -1; -static int hf_btavrcp_media_type = -1; -static int hf_btavrcp_folder_type = -1; -static int hf_btavrcp_folder_playable = -1; -static int hf_btavrcp_major_player_type = -1; -static int hf_btavrcp_player_subtype = -1; -static int hf_btavrcp_player_item = -1; -static int hf_btavrcp_attribute = -1; -static int hf_btavrcp_attribute_count = -1; -static int hf_btavrcp_attribute_value = -1; -static int hf_btavrcp_attribute_value_length = -1; -static int hf_btavrcp_attribute_item = -1; -static int hf_btavrcp_attribute_list = -1; -static int hf_btavrcp_attribute_entries = -1; -static int hf_btavrcp_attribute_name_length = -1; -static int hf_btavrcp_attribute_name = -1; -static int hf_btavrcp_setting_value_length = -1; -static int hf_btavrcp_setting_value = -1; -static int hf_btavrcp_features = -1; -static int hf_btavrcp_not_used_features = -1; -static int hf_btavrcp_feature_reserved_0 = -1; -static int hf_btavrcp_feature_reserved_1 = -1; -static int hf_btavrcp_feature_reserved_2 = -1; -static int hf_btavrcp_feature_reserved_3 = -1; -static int hf_btavrcp_feature_reserved_4 = -1; -static int hf_btavrcp_feature_reserved_5 = -1; -static int hf_btavrcp_feature_reserved_6 = -1; -static int hf_btavrcp_feature_reserved_7 = -1; -static int hf_btavrcp_feature_passthrough_select = -1; -static int hf_btavrcp_feature_passthrough_up = -1; -static int hf_btavrcp_feature_passthrough_down = -1; -static int hf_btavrcp_feature_passthrough_left = -1; -static int hf_btavrcp_feature_passthrough_right = -1; -static int hf_btavrcp_feature_passthrough_right_up = -1; -static int hf_btavrcp_feature_passthrough_right_down = -1; -static int hf_btavrcp_feature_passthrough_left_up = -1; -static int hf_btavrcp_feature_passthrough_left_down = -1; -static int hf_btavrcp_feature_passthrough_root_menu = -1; -static int hf_btavrcp_feature_passthrough_setup_menu = -1; -static int hf_btavrcp_feature_passthrough_contents_menu = -1; -static int hf_btavrcp_feature_passthrough_favorite_menu = -1; -static int hf_btavrcp_feature_passthrough_exit = -1; -static int hf_btavrcp_feature_passthrough_0 = -1; -static int hf_btavrcp_feature_passthrough_1 = -1; -static int hf_btavrcp_feature_passthrough_2 = -1; -static int hf_btavrcp_feature_passthrough_3 = -1; -static int hf_btavrcp_feature_passthrough_4 = -1; -static int hf_btavrcp_feature_passthrough_5 = -1; -static int hf_btavrcp_feature_passthrough_6 = -1; -static int hf_btavrcp_feature_passthrough_7 = -1; -static int hf_btavrcp_feature_passthrough_8 = -1; -static int hf_btavrcp_feature_passthrough_9 = -1; -static int hf_btavrcp_feature_passthrough_dot = -1; -static int hf_btavrcp_feature_passthrough_enter = -1; -static int hf_btavrcp_feature_passthrough_clear = -1; -static int hf_btavrcp_feature_passthrough_channel_up = -1; -static int hf_btavrcp_feature_passthrough_channel_down = -1; -static int hf_btavrcp_feature_passthrough_previous_channel = -1; -static int hf_btavrcp_feature_passthrough_sound_select = -1; -static int hf_btavrcp_feature_passthrough_input_select = -1; -static int hf_btavrcp_feature_passthrough_display_information = -1; -static int hf_btavrcp_feature_passthrough_help = -1; -static int hf_btavrcp_feature_passthrough_page_up = -1; -static int hf_btavrcp_feature_passthrough_page_down = -1; -static int hf_btavrcp_feature_passthrough_power = -1; -static int hf_btavrcp_feature_passthrough_volume_up = -1; -static int hf_btavrcp_feature_passthrough_volume_down = -1; -static int hf_btavrcp_feature_passthrough_mute = -1; -static int hf_btavrcp_feature_passthrough_play = -1; -static int hf_btavrcp_feature_passthrough_stop = -1; -static int hf_btavrcp_feature_passthrough_pause = -1; -static int hf_btavrcp_feature_passthrough_record = -1; -static int hf_btavrcp_feature_passthrough_rewind = -1; -static int hf_btavrcp_feature_passthrough_fast_forward = -1; -static int hf_btavrcp_feature_passthrough_eject = -1; -static int hf_btavrcp_feature_passthrough_forward = -1; -static int hf_btavrcp_feature_passthrough_backward = -1; -static int hf_btavrcp_feature_passthrough_angle = -1; -static int hf_btavrcp_feature_passthrough_subpicture = -1; -static int hf_btavrcp_feature_passthrough_f1 = -1; -static int hf_btavrcp_feature_passthrough_f2 = -1; -static int hf_btavrcp_feature_passthrough_f3 = -1; -static int hf_btavrcp_feature_passthrough_f4 = -1; -static int hf_btavrcp_feature_passthrough_f5 = -1; -static int hf_btavrcp_feature_vendor_unique = -1; -static int hf_btavrcp_feature_basic_group_navigation = -1; -static int hf_btavrcp_feature_advanced_control_player = -1; -static int hf_btavrcp_feature_browsing = -1; -static int hf_btavrcp_feature_searching = -1; -static int hf_btavrcp_feature_addtonowplayer = -1; -static int hf_btavrcp_feature_uid_unique = -1; -static int hf_btavrcp_feature_only_browsable_when_addressed = -1; -static int hf_btavrcp_feature_only_searchable_when_addressed = -1; -static int hf_btavrcp_feature_nowplaying = -1; -static int hf_btavrcp_feature_uid_persistency = -1; -static int hf_btavrcp_feature_number_of_items = -1; -static int hf_btavrcp_feature_cover_art = -1; -static int hf_btavrcp_reassembled = -1; -static int hf_btavrcp_current_path = -1; -static int hf_btavrcp_response_time = -1; -static int hf_btavrcp_command_in_frame = -1; -static int hf_btavrcp_response_in_frame = -1; -static int hf_btavrcp_data = -1; - -static gint ett_btavrcp = -1; -static gint ett_btavrcp_attribute_list = -1; -static gint ett_btavrcp_attribute_entry = -1; -static gint ett_btavrcp_attribute_entries = -1; -static gint ett_btavrcp_element = -1; -static gint ett_btavrcp_folder = -1; -static gint ett_btavrcp_player = -1; -static gint ett_btavrcp_features = -1; -static gint ett_btavrcp_features_not_used = -1; -static gint ett_btavrcp_path = -1; - -static expert_field ei_btavrcp_no_response = EI_INIT; -static expert_field ei_btavrcp_item_length_bad = EI_INIT; -static expert_field ei_btavrcp_unexpected_data = EI_INIT; +static int proto_btavrcp; + +static int hf_btavrcp_rfa; +static int hf_btavrcp_ctype; +static int hf_btavrcp_subunit_type; +static int hf_btavrcp_subunit_id; +static int hf_btavrcp_opcode; +static int hf_btavrcp_company_id; +static int hf_btavrcp_length; +static int hf_btavrcp_pdu_id; +static int hf_btavrcp_bt_pdu_id; +static int hf_btavrcp_bt_continuing_pdu_id; +static int hf_btavrcp_browsing_pdu_id; +static int hf_btavrcp_reserved; +static int hf_btavrcp_packet_type; +static int hf_btavrcp_passthrough_state; +static int hf_btavrcp_passthrough_operation; +static int hf_btavrcp_passthrough_data_length; +static int hf_btavrcp_passthrough_company_id; +static int hf_btavrcp_passthrough_vendor_unique_id; +static int hf_btavrcp_unit_unknown; +static int hf_btavrcp_unit_type; +static int hf_btavrcp_unit_id; +static int hf_btavrcp_subunit_page; +static int hf_btavrcp_subunit_extension_code; +static int hf_btavrcp_item; +static int hf_btavrcp_folder; +static int hf_btavrcp_player_id; +static int hf_btavrcp_status; +static int hf_btavrcp_uid_counter; +static int hf_btavrcp_number_of_items; +static int hf_btavrcp_number_of_items16; +static int hf_btavrcp_character_set; +static int hf_btavrcp_folder_depth; +static int hf_btavrcp_folder_name_length; +static int hf_btavrcp_folder_name; +static int hf_btavrcp_search; +static int hf_btavrcp_search_length; +static int hf_btavrcp_number_of_attributes; +static int hf_btavrcp_uid; +static int hf_btavrcp_scope; +static int hf_btavrcp_start_item; +static int hf_btavrcp_end_item; +static int hf_btavrcp_direction; +static int hf_btavrcp_identifier; +static int hf_btavrcp_song_length; +static int hf_btavrcp_song_position; +static int hf_btavrcp_play_status; +static int hf_btavrcp_notification_interval; +static int hf_btavrcp_event_id; +static int hf_btavrcp_battery_status; +static int hf_btavrcp_number_of_character_set; +static int hf_btavrcp_absolute_volume_rfa; +static int hf_btavrcp_absolute_volume; +static int hf_btavrcp_capability; +static int hf_btavrcp_capability_count; +static int hf_btavrcp_item_type; +static int hf_btavrcp_item_length; +static int hf_btavrcp_system_status; +static int hf_btavrcp_number_of_settings; +static int hf_btavrcp_settings_attribute; +static int hf_btavrcp_settings_value; +static int hf_btavrcp_displayable_name; +static int hf_btavrcp_displayable_name_length; +static int hf_btavrcp_media_type; +static int hf_btavrcp_folder_type; +static int hf_btavrcp_folder_playable; +static int hf_btavrcp_major_player_type; +static int hf_btavrcp_player_subtype; +static int hf_btavrcp_player_item; +static int hf_btavrcp_attribute; +static int hf_btavrcp_attribute_count; +static int hf_btavrcp_attribute_value; +static int hf_btavrcp_attribute_value_length; +static int hf_btavrcp_attribute_item; +static int hf_btavrcp_attribute_list; +static int hf_btavrcp_attribute_entries; +static int hf_btavrcp_attribute_name_length; +static int hf_btavrcp_attribute_name; +static int hf_btavrcp_setting_value_length; +static int hf_btavrcp_setting_value; +static int hf_btavrcp_features; +static int hf_btavrcp_not_used_features; +static int hf_btavrcp_feature_reserved_0; +static int hf_btavrcp_feature_reserved_1; +static int hf_btavrcp_feature_reserved_2; +static int hf_btavrcp_feature_reserved_3; +static int hf_btavrcp_feature_reserved_4; +static int hf_btavrcp_feature_reserved_5; +static int hf_btavrcp_feature_reserved_6; +static int hf_btavrcp_feature_reserved_7; +static int hf_btavrcp_feature_passthrough_select; +static int hf_btavrcp_feature_passthrough_up; +static int hf_btavrcp_feature_passthrough_down; +static int hf_btavrcp_feature_passthrough_left; +static int hf_btavrcp_feature_passthrough_right; +static int hf_btavrcp_feature_passthrough_right_up; +static int hf_btavrcp_feature_passthrough_right_down; +static int hf_btavrcp_feature_passthrough_left_up; +static int hf_btavrcp_feature_passthrough_left_down; +static int hf_btavrcp_feature_passthrough_root_menu; +static int hf_btavrcp_feature_passthrough_setup_menu; +static int hf_btavrcp_feature_passthrough_contents_menu; +static int hf_btavrcp_feature_passthrough_favorite_menu; +static int hf_btavrcp_feature_passthrough_exit; +static int hf_btavrcp_feature_passthrough_0; +static int hf_btavrcp_feature_passthrough_1; +static int hf_btavrcp_feature_passthrough_2; +static int hf_btavrcp_feature_passthrough_3; +static int hf_btavrcp_feature_passthrough_4; +static int hf_btavrcp_feature_passthrough_5; +static int hf_btavrcp_feature_passthrough_6; +static int hf_btavrcp_feature_passthrough_7; +static int hf_btavrcp_feature_passthrough_8; +static int hf_btavrcp_feature_passthrough_9; +static int hf_btavrcp_feature_passthrough_dot; +static int hf_btavrcp_feature_passthrough_enter; +static int hf_btavrcp_feature_passthrough_clear; +static int hf_btavrcp_feature_passthrough_channel_up; +static int hf_btavrcp_feature_passthrough_channel_down; +static int hf_btavrcp_feature_passthrough_previous_channel; +static int hf_btavrcp_feature_passthrough_sound_select; +static int hf_btavrcp_feature_passthrough_input_select; +static int hf_btavrcp_feature_passthrough_display_information; +static int hf_btavrcp_feature_passthrough_help; +static int hf_btavrcp_feature_passthrough_page_up; +static int hf_btavrcp_feature_passthrough_page_down; +static int hf_btavrcp_feature_passthrough_power; +static int hf_btavrcp_feature_passthrough_volume_up; +static int hf_btavrcp_feature_passthrough_volume_down; +static int hf_btavrcp_feature_passthrough_mute; +static int hf_btavrcp_feature_passthrough_play; +static int hf_btavrcp_feature_passthrough_stop; +static int hf_btavrcp_feature_passthrough_pause; +static int hf_btavrcp_feature_passthrough_record; +static int hf_btavrcp_feature_passthrough_rewind; +static int hf_btavrcp_feature_passthrough_fast_forward; +static int hf_btavrcp_feature_passthrough_eject; +static int hf_btavrcp_feature_passthrough_forward; +static int hf_btavrcp_feature_passthrough_backward; +static int hf_btavrcp_feature_passthrough_angle; +static int hf_btavrcp_feature_passthrough_subpicture; +static int hf_btavrcp_feature_passthrough_f1; +static int hf_btavrcp_feature_passthrough_f2; +static int hf_btavrcp_feature_passthrough_f3; +static int hf_btavrcp_feature_passthrough_f4; +static int hf_btavrcp_feature_passthrough_f5; +static int hf_btavrcp_feature_vendor_unique; +static int hf_btavrcp_feature_basic_group_navigation; +static int hf_btavrcp_feature_advanced_control_player; +static int hf_btavrcp_feature_browsing; +static int hf_btavrcp_feature_searching; +static int hf_btavrcp_feature_addtonowplayer; +static int hf_btavrcp_feature_uid_unique; +static int hf_btavrcp_feature_only_browsable_when_addressed; +static int hf_btavrcp_feature_only_searchable_when_addressed; +static int hf_btavrcp_feature_nowplaying; +static int hf_btavrcp_feature_uid_persistency; +static int hf_btavrcp_feature_number_of_items; +static int hf_btavrcp_feature_cover_art; +static int hf_btavrcp_reassembled; +static int hf_btavrcp_current_path; +static int hf_btavrcp_response_time; +static int hf_btavrcp_command_in_frame; +static int hf_btavrcp_response_in_frame; +static int hf_btavrcp_data; + +static gint ett_btavrcp; +static gint ett_btavrcp_attribute_list; +static gint ett_btavrcp_attribute_entry; +static gint ett_btavrcp_attribute_entries; +static gint ett_btavrcp_element; +static gint ett_btavrcp_folder; +static gint ett_btavrcp_player; +static gint ett_btavrcp_features; +static gint ett_btavrcp_features_not_used; +static gint ett_btavrcp_path; + +static expert_field ei_btavrcp_no_response; +static expert_field ei_btavrcp_item_length_bad; +static expert_field ei_btavrcp_unexpected_data; static dissector_handle_t btavrcp_handle; @@ -639,7 +639,7 @@ dissect_attribute_entries(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, for (i_entry = 0; i_entry < count; ++i_entry) { attribute_id = tvb_get_ntohl(tvb, offset); value_length = tvb_get_ntohs(tvb, offset + 4 + 2); - value = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 4 + 2 + 2, value_length, ENC_ASCII); + value = tvb_get_string_enc(pinfo->pool, tvb, offset + 4 + 2 + 2, value_length, ENC_ASCII); if (attribute_id == 0x01) col_append_fstr(pinfo->cinfo, COL_INFO, " - Title: \"%s\"", value); @@ -661,7 +661,7 @@ dissect_attribute_entries(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static gint -dissect_item_mediaplayer(tvbuff_t *tvb, proto_tree *tree, gint offset) +dissect_item_mediaplayer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { guint displayable_name_length; guint item_length; @@ -677,7 +677,7 @@ dissect_item_mediaplayer(tvbuff_t *tvb, proto_tree *tree, gint offset) item_length = tvb_get_ntohs(tvb, offset + 1); displayable_name_length = tvb_get_ntohs(tvb, offset + 1 + 2 + 2 + 1 + 4 + 16 + 1 + 2); - displayable_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1 + 2 + 2 + 1 + 4 + 16 + 1 + 2 + 2, displayable_name_length, ENC_ASCII); + displayable_name = tvb_get_string_enc(pinfo->pool, tvb, offset + 1 + 2 + 2 + 1 + 4 + 16 + 1 + 2 + 2, displayable_name_length, ENC_ASCII); pitem = proto_tree_add_none_format(tree, hf_btavrcp_player_item, tvb, offset, 1 + 2 + item_length, "Player: %s", displayable_name); ptree = proto_item_add_subtree(pitem, ett_btavrcp_player); @@ -839,7 +839,7 @@ dissect_item_media_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, item_length = tvb_get_ntohs(tvb, offset + 1); displayable_name_length = tvb_get_ntohs(tvb, offset + 1 + 2 + 8 + 1 + 2); - displayable_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1 + 2 + 8 + 1 + 2 + 2, displayable_name_length, ENC_ASCII); + displayable_name = tvb_get_string_enc(pinfo->pool, tvb, offset + 1 + 2 + 8 + 1 + 2 + 2, displayable_name_length, ENC_ASCII); pitem = proto_tree_add_none_format(tree, hf_btavrcp_item , tvb, offset, 1 + 2 + item_length, "Element: %s", displayable_name); ptree = proto_item_add_subtree(pitem, ett_btavrcp_element); @@ -881,7 +881,7 @@ dissect_item_media_element(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static gint -dissect_item_folder(tvbuff_t *tvb, proto_tree *tree, gint offset) +dissect_item_folder(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset) { guint displayable_name_length; guint item_length; @@ -891,7 +891,7 @@ dissect_item_folder(tvbuff_t *tvb, proto_tree *tree, gint offset) item_length = tvb_get_ntohs(tvb, offset + 1); displayable_name_length = tvb_get_ntohs(tvb, offset + 1 + 2 + 8 + 1 + 1 + 2); - displayable_name = tvb_get_string_enc(wmem_packet_scope(), tvb, offset + 1 + 2 + 8 + 1 + 1 + 2 + 2, displayable_name_length, ENC_ASCII); + displayable_name = tvb_get_string_enc(pinfo->pool, tvb, offset + 1 + 2 + 8 + 1 + 1 + 2 + 2, displayable_name_length, ENC_ASCII); pitem = proto_tree_add_none_format(tree, hf_btavrcp_folder, tvb, offset, 1 + 2 + item_length, "Folder : %s", displayable_name); ptree = proto_item_add_subtree(pitem, ett_btavrcp_folder); @@ -1787,7 +1787,7 @@ dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uid_counter = tvb_get_ntohs(tvb, offset); offset += 2; - col_append_fstr(pinfo->cinfo, COL_INFO, " - Scope: %s, Uid: 0x%016" G_GINT64_MODIFIER "x, UidCounter: 0x%04x", + col_append_fstr(pinfo->cinfo, COL_INFO, " - Scope: %s, Uid: 0x%016" PRIx64 ", UidCounter: 0x%04x", val_to_str_const(scope, scope_vals, "unknown"), uid, uid_counter); } else { guint status; @@ -1815,7 +1815,7 @@ dissect_vendor_dependent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uid_counter = tvb_get_ntohs(tvb, offset); offset += 2; - col_append_fstr(pinfo->cinfo, COL_INFO, " - Scope: %s, Uid: 0x%016" G_GINT64_MODIFIER "x, UidCounter: 0x%04x", + col_append_fstr(pinfo->cinfo, COL_INFO, " - Scope: %s, Uid: 0x%016" PRIx64 ", UidCounter: 0x%04x", val_to_str_const(scope, scope_vals, "unknown"), uid, uid_counter); } else { guint status; @@ -1898,7 +1898,7 @@ dissect_browsing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(ptree, hf_btavrcp_folder_name_length, tvb, offset, 2, ENC_BIG_ENDIAN); folder_name_length = tvb_get_ntohs(tvb, offset); offset += 2; - proto_tree_add_item_ret_string(ptree, hf_btavrcp_folder_name, tvb, offset, folder_name_length, ENC_ASCII|ENC_NA, wmem_packet_scope(), &folder_name); + proto_tree_add_item_ret_string(ptree, hf_btavrcp_folder_name, tvb, offset, folder_name_length, ENC_ASCII|ENC_NA, pinfo->pool, &folder_name); offset += folder_name_length; proto_item_append_text(pitem, "%s/", folder_name); col_append_fstr(pinfo->cinfo, COL_INFO, "%s/", folder_name); @@ -1950,13 +1950,13 @@ dissect_browsing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, item_length = tvb_get_ntohs(tvb, offset + 1); if (item_type == ITEM_MEDIAPLAYER) { - dissect_item_mediaplayer(tvb, tree, offset); + dissect_item_mediaplayer(tvb, pinfo, tree, offset); offset += 1 + 2 + item_length; } else if (item_type == ITEM_MEDIA_ELEMENT) { dissect_item_media_element(tvb, pinfo, tree, offset); offset += 1 + 2 + item_length; } else if (item_type == ITEM_FOLDER) { - dissect_item_folder(tvb, tree, offset); + dissect_item_folder(tvb, pinfo, tree, offset); offset += 1 + 2 + item_length; } else { proto_tree_add_item(tree, hf_btavrcp_data, tvb, offset, item_length, ENC_NA); @@ -1981,7 +1981,7 @@ dissect_browsing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uid = tvb_get_ntoh64(tvb, offset); offset += 8; - col_append_fstr(pinfo->cinfo, COL_INFO, " - Direction: %s, Uid: 0x%016" G_GINT64_MODIFIER "x, UidCounter: 0x%04x", + col_append_fstr(pinfo->cinfo, COL_INFO, " - Direction: %s, Uid: 0x%016" PRIx64 ", UidCounter: 0x%04x", val_to_str_const(direction, direction_vals, "unknown"), uid, uid_counter); } else { guint number_of_items; @@ -2011,7 +2011,7 @@ dissect_browsing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_btavrcp_number_of_attributes, tvb, offset, 1, ENC_BIG_ENDIAN); number_of_attributes = tvb_get_guint8(tvb, offset); - col_append_fstr(pinfo->cinfo, COL_INFO, " - Scope: %s, Uid: 0x%016" G_GINT64_MODIFIER "x, UidCounter: 0x%04x", + col_append_fstr(pinfo->cinfo, COL_INFO, " - Scope: %s, Uid: 0x%016" PRIx64 ", UidCounter: 0x%04x", val_to_str_const(scope, scope_vals, "unknown"), uid, uid_counter); offset += 1; @@ -2359,7 +2359,7 @@ proto_register_btavrcp(void) }, { &hf_btavrcp_unit_unknown, { "Unknown", "btavrcp.unit.unknown", - FT_UINT8, BASE_HEX, NULL, 0xFF, + FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL } }, { &hf_btavrcp_unit_type, @@ -2699,12 +2699,12 @@ proto_register_btavrcp(void) NULL, HFILL } }, { &hf_btavrcp_attribute_name_length, - { "Value Length", "btavrcp.attribute_name.length", + { "Name Length", "btavrcp.attribute_name.length", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_btavrcp_attribute_name, - { "Value", "btavrcp.attribute_name", + { "Name", "btavrcp.attribute_name", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL } }, |