From bdb460ef6992d0561bf2b2e7e6f947771880fabf Mon Sep 17 00:00:00 2001 From: Jaap Keuter Date: Sun, 13 Mar 2022 13:31:17 +0100 Subject: [PATCH] Bluetooth: have BT specific global names contain bluetooth --- epan/dissectors/packet-bluetooth.c | 12 +-- epan/dissectors/packet-bluetooth.h | 8 +- epan/dissectors/packet-btatt.c | 74 +++++++++---------- epan/dissectors/packet-btavctp.c | 6 +- epan/dissectors/packet-btavdtp.c | 2 +- epan/dissectors/packet-btbredr_rf.c | 8 +- epan/dissectors/packet-bthci_cmd.c | 34 ++++----- epan/dissectors/packet-bthci_evt.c | 34 ++++----- epan/dissectors/packet-btl2cap.c | 36 ++++----- epan/dissectors/packet-btle.c | 8 +- epan/dissectors/packet-btrfcomm.c | 10 +-- epan/dissectors/packet-btsdp.c | 20 ++--- epan/dissectors/packet-hci_mon.c | 2 +- epan/dissectors/packet-hci_usb.c | 2 +- packaging/debian/libwireshark0.symbols | 4 +- ...bluetooth_att_server_attributes_dialog.cpp | 4 +- 16 files changed, 132 insertions(+), 132 deletions(-) diff --git a/epan/dissectors/packet-bluetooth.c b/epan/dissectors/packet-bluetooth.c index 81f2f73630..1f62cddf40 100644 --- a/epan/dissectors/packet-bluetooth.c +++ b/epan/dissectors/packet-bluetooth.c @@ -4265,7 +4265,7 @@ static const value_string bluetooth_pid_vals[] = { { 0, NULL } }; -guint32 max_disconnect_in_frame = G_MAXUINT32; +guint32 bluetooth_max_disconnect_in_frame = G_MAXUINT32; void proto_register_bluetooth(void); @@ -4475,7 +4475,7 @@ get_conversation(packet_info *pinfo, } bluetooth_uuid_t -get_uuid(tvbuff_t *tvb, gint offset, gint size) +get_bluetooth_uuid(tvbuff_t *tvb, gint offset, gint size) { bluetooth_uuid_t uuid; @@ -4529,7 +4529,7 @@ get_uuid(tvbuff_t *tvb, gint offset, gint size) } const gchar * -print_numeric_uuid(bluetooth_uuid_t *uuid) +print_numeric_bluetooth_uuid(bluetooth_uuid_t *uuid) { if (!(uuid && uuid->size > 0)) return NULL; @@ -4558,7 +4558,7 @@ print_numeric_uuid(bluetooth_uuid_t *uuid) } const gchar * -print_uuid(bluetooth_uuid_t *uuid) +print_bluetooth_uuid(bluetooth_uuid_t *uuid) { const gchar *description; @@ -4582,7 +4582,7 @@ print_uuid(bluetooth_uuid_t *uuid) */ } - description = print_numeric_uuid(uuid); + description = print_numeric_bluetooth_uuid(uuid); if (description) { description = (const gchar *) wmem_tree_lookup_string(bluetooth_uuids, description, 0); @@ -4631,7 +4631,7 @@ dissect_bluetooth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else bluetooth_data->interface_id = HCI_INTERFACE_DEFAULT; bluetooth_data->adapter_id = HCI_ADAPTER_DEFAULT; - bluetooth_data->adapter_disconnect_in_frame = &max_disconnect_in_frame; + bluetooth_data->adapter_disconnect_in_frame = &bluetooth_max_disconnect_in_frame; bluetooth_data->chandle_sessions = chandle_sessions; bluetooth_data->chandle_to_bdaddr = chandle_to_bdaddr; bluetooth_data->chandle_to_mode = chandle_to_mode; diff --git a/epan/dissectors/packet-bluetooth.h b/epan/dissectors/packet-bluetooth.h index 9b7995d30e..30f57d1814 100644 --- a/epan/dissectors/packet-bluetooth.h +++ b/epan/dissectors/packet-bluetooth.h @@ -306,15 +306,15 @@ WS_DLL_PUBLIC wmem_tree_t *bluetooth_uuids; WS_DLL_PUBLIC value_string_ext bluetooth_uuid_vals_ext; WS_DLL_PUBLIC value_string_ext bluetooth_company_id_vals_ext; -extern guint32 max_disconnect_in_frame; +extern guint32 bluetooth_max_disconnect_in_frame; extern gint dissect_bd_addr(gint hf_bd_addr, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, gint offset, gboolean is_local_bd_addr, guint32 interface_id, guint32 adapter_id, guint8 *bdaddr); -extern bluetooth_uuid_t get_uuid(tvbuff_t *tvb, gint offset, gint size); -WS_DLL_PUBLIC const gchar *print_uuid(bluetooth_uuid_t *uuid); -WS_DLL_PUBLIC const gchar *print_numeric_uuid(bluetooth_uuid_t *uuid); +extern bluetooth_uuid_t get_bluetooth_uuid(tvbuff_t *tvb, gint offset, gint size); +WS_DLL_PUBLIC const gchar *print_bluetooth_uuid(bluetooth_uuid_t *uuid); +WS_DLL_PUBLIC const gchar *print_numeric_bluetooth_uuid(bluetooth_uuid_t *uuid); extern void save_local_device_name_from_eir_ad(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint8 size, bluetooth_data_t *bluetooth_data); diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c index 57720f9d5d..b75d998d4f 100644 --- a/epan/dissectors/packet-btatt.c +++ b/epan/dissectors/packet-btatt.c @@ -4401,7 +4401,7 @@ save_handle(packet_info *pinfo, bluetooth_uuid_t uuid, guint32 handle, } static bluetooth_uuid_t -get_uuid_from_handle(packet_info *pinfo, guint32 handle, +get_bluetooth_uuid_from_handle(packet_info *pinfo, guint32 handle, bluetooth_data_t *bluetooth_data) { wmem_tree_key_t key[4]; @@ -4528,17 +4528,17 @@ static void col_append_info_by_handle(packet_info *pinfo, guint16 handle, blueto service_uuid = get_service_uuid_from_handle(pinfo, handle, bluetooth_data); characteristic_uuid = get_characteristic_uuid_from_handle(pinfo, handle, bluetooth_data); - uuid = get_uuid_from_handle(pinfo, handle, bluetooth_data); + uuid = get_bluetooth_uuid_from_handle(pinfo, handle, bluetooth_data); if (!memcmp(&service_uuid, &uuid, sizeof(uuid))) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Handle: 0x%04x (%s)", - handle, print_uuid(&uuid)); + handle, print_bluetooth_uuid(&uuid)); } else if (!memcmp(&characteristic_uuid, &uuid, sizeof(uuid))) { col_append_fstr(pinfo->cinfo, COL_INFO, ", Handle: 0x%04x (%s: %s)", - handle, print_uuid(&service_uuid), print_uuid(&uuid)); + handle, print_bluetooth_uuid(&service_uuid), print_bluetooth_uuid(&uuid)); } else { col_append_fstr(pinfo->cinfo, COL_INFO, ", Handle: 0x%04x (%s: %s: %s)", - handle, print_uuid(&service_uuid), print_uuid(&characteristic_uuid), print_uuid(&uuid)); + handle, print_bluetooth_uuid(&service_uuid), print_bluetooth_uuid(&characteristic_uuid), print_bluetooth_uuid(&uuid)); } } @@ -4549,12 +4549,12 @@ static gint dissect_gatt_uuid(proto_tree *tree, packet_info *pinfo, tvbuff_t *tv if (tvb_reported_length_remaining(tvb, offset) == 2) { proto_tree_add_item(tree, hf_btatt_uuid16, tvb, offset, 2, ENC_LITTLE_ENDIAN); - sub_uuid = get_uuid(tvb, offset, 2); + sub_uuid = get_bluetooth_uuid(tvb, offset, 2); offset += 2; } else if (tvb_reported_length_remaining(tvb, offset) == 16) { sub_item = proto_tree_add_item(tree, hf_btatt_uuid128, tvb, offset, 16, ENC_NA); - sub_uuid = get_uuid(tvb, offset, 16); - proto_item_append_text(sub_item, " (%s)", print_uuid(&sub_uuid)); + sub_uuid = get_bluetooth_uuid(tvb, offset, 16); + proto_item_append_text(sub_item, " (%s)", print_bluetooth_uuid(&sub_uuid)); offset += 16; } else { sub_item = proto_tree_add_item(tree, hf_btatt_value, tvb, offset, -1, ENC_NA); @@ -4589,12 +4589,12 @@ dissect_handle(proto_tree *tree, packet_info *pinfo, gint hf, service_uuid = get_service_uuid_from_handle(pinfo, (guint16) handle, bluetooth_data); characteristic_uuid = get_characteristic_uuid_from_handle(pinfo, (guint16) handle, bluetooth_data); - attribute_uuid = get_uuid_from_handle(pinfo, (guint16) handle, bluetooth_data); + attribute_uuid = get_bluetooth_uuid_from_handle(pinfo, (guint16) handle, bluetooth_data); proto_item_append_text(handle_item, " ("); if (memcmp(&service_uuid, &attribute_uuid, sizeof(attribute_uuid))) { if (service_uuid.size == 2 || service_uuid.size == 16) { - proto_item_append_text(handle_item, "%s: ", print_uuid(&service_uuid)); + proto_item_append_text(handle_item, "%s: ", print_bluetooth_uuid(&service_uuid)); sub_tree = proto_item_add_subtree(handle_item, ett_btatt_handle); if (service_uuid.size == 2) @@ -4608,7 +4608,7 @@ dissect_handle(proto_tree *tree, packet_info *pinfo, gint hf, if (memcmp(&characteristic_uuid, &attribute_uuid, sizeof(attribute_uuid))) { if (characteristic_uuid.size == 2 || characteristic_uuid.size == 16) { - proto_item_append_text(handle_item, "%s: ", print_uuid(&characteristic_uuid)); + proto_item_append_text(handle_item, "%s: ", print_bluetooth_uuid(&characteristic_uuid)); sub_tree = proto_item_add_subtree(handle_item, ett_btatt_handle); if (characteristic_uuid.size == 2) @@ -4620,7 +4620,7 @@ dissect_handle(proto_tree *tree, packet_info *pinfo, gint hf, } } - proto_item_append_text(handle_item, "%s)", print_uuid(&attribute_uuid)); + proto_item_append_text(handle_item, "%s)", print_bluetooth_uuid(&attribute_uuid)); if (attribute_uuid.size == 2 || attribute_uuid.size == 16) { sub_tree = proto_item_add_subtree(handle_item, ett_btatt_handle); @@ -4800,13 +4800,13 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info * if (p_get_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID) == NULL) { guint8 *value_data; - value_data = wmem_strdup(wmem_file_scope(), print_numeric_uuid(&uuid)); + value_data = wmem_strdup(wmem_file_scope(), print_numeric_bluetooth_uuid(&uuid)); p_add_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID, value_data); } /* hier wird subddisector aufgerufen */ /* dort wird auch von einem neuen PAket ausgegangen, was es natürlich nicht ist, darum fehelern und kein subddisector aufgerufen*/ - if (dissector_try_string(bluetooth_uuid_table, print_numeric_uuid(&uuid), tvb, pinfo, tree, att_data)) + if (dissector_try_string(bluetooth_uuid_table, print_numeric_bluetooth_uuid(&uuid), tvb, pinfo, tree, att_data)) return old_offset + length; else if (!uuid.bt_uuid) { if (bluetooth_gatt_has_no_parameter(att_data->opcode)) @@ -4833,22 +4833,22 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info * if (tvb_reported_length_remaining(tvb, offset) == 2) { proto_tree_add_item(tree, hf_btatt_uuid16, tvb, offset, 2, ENC_LITTLE_ENDIAN); - sub_uuid = get_uuid(tvb, offset, 2); - proto_item_append_text(patron_item, ", UUID: %s", print_uuid(&sub_uuid)); + sub_uuid = get_bluetooth_uuid(tvb, offset, 2); + proto_item_append_text(patron_item, ", UUID: %s", print_bluetooth_uuid(&sub_uuid)); offset += 2; - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_uuid(&sub_uuid)); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_bluetooth_uuid(&sub_uuid)); save_handle(pinfo, sub_uuid, handle, ATTRIBUTE_TYPE_SERVICE, bluetooth_data); } else if (tvb_reported_length_remaining(tvb, offset) == 16) { proto_tree_add_item(tree, hf_btatt_uuid128, tvb, offset, 16, ENC_NA); - sub_uuid = get_uuid(tvb, offset, 16); - proto_item_append_text(patron_item, ", UUID128: %s", print_uuid(&sub_uuid)); + sub_uuid = get_bluetooth_uuid(tvb, offset, 16); + proto_item_append_text(patron_item, ", UUID128: %s", print_bluetooth_uuid(&sub_uuid)); offset += 16; - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_uuid(&sub_uuid)); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_bluetooth_uuid(&sub_uuid)); save_handle(pinfo, sub_uuid, handle, ATTRIBUTE_TYPE_SERVICE, bluetooth_data); } @@ -4877,11 +4877,11 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info * offset += 2; proto_tree_add_item(tree, hf_btatt_uuid16, tvb, offset, 2, ENC_LITTLE_ENDIAN); - sub_uuid = get_uuid(tvb, offset, 2); - proto_item_append_text(patron_item, ", Included Handle: 0x%04x, UUID: %s", sub_handle, print_uuid(&sub_uuid)); + sub_uuid = get_bluetooth_uuid(tvb, offset, 2); + proto_item_append_text(patron_item, ", Included Handle: 0x%04x, UUID: %s", sub_handle, print_bluetooth_uuid(&sub_uuid)); offset += 2; - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_uuid(&sub_uuid)); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_bluetooth_uuid(&sub_uuid)); save_handle(pinfo, sub_uuid, sub_handle, ATTRIBUTE_TYPE_OTHER, bluetooth_data); @@ -4904,22 +4904,22 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info * if (tvb_reported_length_remaining(tvb, offset) == 16) { proto_tree_add_item(tree, hf_btatt_uuid128, tvb, offset, 16, ENC_NA); - sub_uuid = get_uuid(tvb, offset, 16); - proto_item_append_text(patron_item, ", Characteristic Handle: 0x%04x, UUID128: %s", tvb_get_guint16(tvb, offset - 2, ENC_LITTLE_ENDIAN), print_uuid(&sub_uuid)); + sub_uuid = get_bluetooth_uuid(tvb, offset, 16); + proto_item_append_text(patron_item, ", Characteristic Handle: 0x%04x, UUID128: %s", tvb_get_guint16(tvb, offset - 2, ENC_LITTLE_ENDIAN), print_bluetooth_uuid(&sub_uuid)); offset += 16; - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_uuid(&sub_uuid)); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_bluetooth_uuid(&sub_uuid)); save_handle(pinfo, sub_uuid, sub_handle, ATTRIBUTE_TYPE_CHARACTERISTIC, bluetooth_data); } else if (tvb_reported_length_remaining(tvb, offset) == 2) { proto_tree_add_item(tree, hf_btatt_uuid16, tvb, offset, 2, ENC_LITTLE_ENDIAN); - sub_uuid = get_uuid(tvb, offset, 2); - proto_item_append_text(patron_item, ", Characteristic Handle: 0x%04x, UUID: %s", sub_handle, print_uuid(&sub_uuid)); + sub_uuid = get_bluetooth_uuid(tvb, offset, 2); + proto_item_append_text(patron_item, ", Characteristic Handle: 0x%04x, UUID: %s", sub_handle, print_bluetooth_uuid(&sub_uuid)); offset += 2; - col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_uuid(&sub_uuid)); + col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", print_bluetooth_uuid(&sub_uuid)); save_handle(pinfo, sub_uuid, sub_handle, ATTRIBUTE_TYPE_CHARACTERISTIC, bluetooth_data); } else { @@ -5227,7 +5227,7 @@ dissect_attribute_value(proto_tree *tree, proto_item *patron_item, packet_info * characteristic_uuid = get_characteristic_uuid_from_handle(pinfo, handle, bluetooth_data); - characteristic_dissector_name = wmem_strdup_printf(pinfo->pool, "btgatt.uuid0x%s", print_numeric_uuid(&characteristic_uuid)); + characteristic_dissector_name = wmem_strdup_printf(pinfo->pool, "btgatt.uuid0x%s", print_numeric_bluetooth_uuid(&characteristic_uuid)); characteristic_dissector = find_dissector(characteristic_dissector_name); sub_item = proto_tree_add_item(tree, hf_btatt_valid_range_lower_inclusive_value, tvb, offset, tvb_reported_length_remaining(tvb, offset) / 2, ENC_NA); @@ -11115,11 +11115,11 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) handle = tvb_get_guint16(tvb, offset - 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(sub_tree, hf_btatt_uuid16, tvb, offset, 2, ENC_LITTLE_ENDIAN); - uuid = get_uuid(tvb, offset, 2); + uuid = get_bluetooth_uuid(tvb, offset, 2); offset += 2; proto_item_append_text(sub_item, ", Handle: 0x%04x, UUID: %s", - handle, print_uuid(&uuid)); + handle, print_bluetooth_uuid(&uuid)); save_handle(pinfo, uuid, handle, ATTRIBUTE_TYPE_OTHER, bluetooth_data); @@ -11135,11 +11135,11 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) handle = tvb_get_guint16(tvb, offset - 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(sub_tree, hf_btatt_uuid128, tvb, offset, 16, ENC_NA); - uuid = get_uuid(tvb, offset, 16); + uuid = get_bluetooth_uuid(tvb, offset, 16); offset += 16; proto_item_append_text(sub_item, ", Handle: 0x%04x, UUID: %s", - handle, print_uuid(&uuid)); + handle, print_bluetooth_uuid(&uuid)); save_handle(pinfo, uuid, handle, ATTRIBUTE_TYPE_OTHER, bluetooth_data); @@ -11164,7 +11164,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset += 2; proto_tree_add_item(main_tree, hf_btatt_uuid16, tvb, offset, 2, ENC_LITTLE_ENDIAN); - uuid = get_uuid(tvb, offset - 2, 2); + uuid = get_bluetooth_uuid(tvb, offset - 2, 2); offset += 2; dissect_attribute_value(main_tree, NULL, pinfo, tvb, offset, tvb_captured_length_remaining(tvb, offset), 0, uuid, &att_data); @@ -11224,7 +11224,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) request_parameters.read_by_type.starting_handle = tvb_get_guint16(tvb, offset - 6, ENC_LITTLE_ENDIAN); request_parameters.read_by_type.ending_handle = tvb_get_guint16(tvb, offset - 4, ENC_LITTLE_ENDIAN); - request_parameters.read_by_type.uuid = get_uuid(tvb, offset - 2, 2); + request_parameters.read_by_type.uuid = get_bluetooth_uuid(tvb, offset - 2, 2); save_request(pinfo, opcode, request_parameters, bluetooth_data); } @@ -11239,7 +11239,7 @@ dissect_btatt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) request_parameters.read_by_type.starting_handle = tvb_get_guint16(tvb, offset - 20, ENC_LITTLE_ENDIAN); request_parameters.read_by_type.ending_handle = tvb_get_guint16(tvb, offset - 18, ENC_LITTLE_ENDIAN); - request_parameters.read_by_type.uuid = get_uuid(tvb, offset - 16, 16); + request_parameters.read_by_type.uuid = get_bluetooth_uuid(tvb, offset - 16, 16); save_request(pinfo, opcode, request_parameters, bluetooth_data); } diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index 792a3dd366..151e02d510 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -180,7 +180,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) uuid.data[0] = pid >> 8; uuid.data[1] = pid & 0xFF; - value_data = wmem_strdup(wmem_file_scope(), print_numeric_uuid(&uuid)); + value_data = wmem_strdup(wmem_file_scope(), print_numeric_bluetooth_uuid(&uuid)); p_add_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID, value_data); } @@ -217,7 +217,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) uuid.data[0] = pid >> 8; uuid.data[1] = pid & 0xFF; - if (!dissector_try_string(bluetooth_uuid_table, print_numeric_uuid(&uuid), next_tvb, pinfo, tree, avctp_data)) { + if (!dissector_try_string(bluetooth_uuid_table, print_numeric_bluetooth_uuid(&uuid), next_tvb, pinfo, tree, avctp_data)) { call_data_dissector(next_tvb, pinfo, tree); } @@ -382,7 +382,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) uuid.data[0] = fragments->pid >> 8; uuid.data[1] = fragments->pid & 0xFF; - if (!dissector_try_string(bluetooth_uuid_table, print_numeric_uuid(&uuid), next_tvb, pinfo, tree, avctp_data)) { + if (!dissector_try_string(bluetooth_uuid_table, print_numeric_bluetooth_uuid(&uuid), next_tvb, pinfo, tree, avctp_data)) { call_data_dissector(next_tvb, pinfo, tree); } } diff --git a/epan/dissectors/packet-btavdtp.c b/epan/dissectors/packet-btavdtp.c index a9654aa823..587203bb08 100644 --- a/epan/dissectors/packet-btavdtp.c +++ b/epan/dissectors/packet-btavdtp.c @@ -1522,7 +1522,7 @@ dissect_btavdtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) channels_info->control_remote_cid = l2cap_data->remote_cid; channels_info->media_local_cid = BTL2CAP_UNKNOWN_CID; channels_info->media_remote_cid = BTL2CAP_UNKNOWN_CID; - channels_info->disconnect_in_frame = max_disconnect_in_frame; + channels_info->disconnect_in_frame = bluetooth_max_disconnect_in_frame; channels_info->l2cap_disconnect_in_frame = l2cap_data->disconnect_in_frame; channels_info->hci_disconnect_in_frame = l2cap_data->hci_disconnect_in_frame; channels_info->adapter_disconnect_in_frame = l2cap_data->adapter_disconnect_in_frame; diff --git a/epan/dissectors/packet-btbredr_rf.c b/epan/dissectors/packet-btbredr_rf.c index 5d3afbe9b4..a19a34571e 100644 --- a/epan/dissectors/packet-btbredr_rf.c +++ b/epan/dissectors/packet-btbredr_rf.c @@ -1658,8 +1658,8 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da acl_data->remote_bd_addr_id = 0; acl_data->is_btle = TRUE; acl_data->is_btle_retransmit = FALSE; - acl_data->adapter_disconnect_in_frame = &max_disconnect_in_frame; - acl_data->disconnect_in_frame = &max_disconnect_in_frame; + acl_data->adapter_disconnect_in_frame = &bluetooth_max_disconnect_in_frame; + acl_data->disconnect_in_frame = &bluetooth_max_disconnect_in_frame; next_tvb = tvb_new_subset_length(tvb, offset + data_header, pdu_len); call_dissector_with_data(btl2cap_handle, next_tvb, pinfo, tree, acl_data); handled = TRUE; @@ -1757,8 +1757,8 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da acl_data->remote_bd_addr_id = 0; acl_data->is_btle = TRUE; acl_data->is_btle_retransmit = FALSE; - acl_data->adapter_disconnect_in_frame = &max_disconnect_in_frame; - acl_data->disconnect_in_frame = &max_disconnect_in_frame; + acl_data->adapter_disconnect_in_frame = &bluetooth_max_disconnect_in_frame; + acl_data->disconnect_in_frame = &bluetooth_max_disconnect_in_frame; call_dissector_with_data(btl2cap_handle, next_tvb, pinfo, tree, acl_data); handled = TRUE; col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Data"); diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index b43cfff183..3613d3f694 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -5756,9 +5756,9 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat bthci_cmd_data->opcode = opcode; bthci_cmd_data->command_in_frame = frame_number; bthci_cmd_data->command_abs_ts = pinfo->abs_ts; - bthci_cmd_data->pending_in_frame = max_disconnect_in_frame; + bthci_cmd_data->pending_in_frame = bluetooth_max_disconnect_in_frame; bthci_cmd_data->pending_abs_ts = pinfo->abs_ts; - bthci_cmd_data->response_in_frame = max_disconnect_in_frame; + bthci_cmd_data->response_in_frame = bluetooth_max_disconnect_in_frame; bthci_cmd_data->response_abs_ts = pinfo->abs_ts; } @@ -5891,7 +5891,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat subtree = (wmem_tree_t *) wmem_tree_lookup32_array(bthci_cmds, key); bthci_cmd_data = (subtree) ? (bthci_cmd_data_t *) wmem_tree_lookup32_le(subtree, pinfo->num) : NULL; - if (bthci_cmd_data && bthci_cmd_data->pending_in_frame < max_disconnect_in_frame) { + if (bthci_cmd_data && bthci_cmd_data->pending_in_frame < bluetooth_max_disconnect_in_frame) { nstime_t delta; sub_item = proto_tree_add_uint(bthci_cmd_tree, hf_pending_in_frame, tvb, 0, 0, bthci_cmd_data->pending_in_frame); @@ -5901,7 +5901,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat sub_item = proto_tree_add_double(bthci_cmd_tree, hf_command_pending_time_delta, tvb, 0, 0, nstime_to_msec(&delta)); proto_item_set_generated(sub_item); } - if (bthci_cmd_data && bthci_cmd_data->response_in_frame < max_disconnect_in_frame) { + if (bthci_cmd_data && bthci_cmd_data->response_in_frame < bluetooth_max_disconnect_in_frame) { nstime_t delta; sub_item = proto_tree_add_uint(bthci_cmd_tree, hf_response_in_frame, tvb, 0, 0, bthci_cmd_data->response_in_frame); @@ -9027,13 +9027,13 @@ dissect_eir_ad_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, bluetoo case 0x1F: /* List of 32-bit Service Solicitation UUIDs */ end_offset = offset + length; while (offset < end_offset) { - uuid = get_uuid(tvb, offset, 4); + uuid = get_bluetooth_uuid(tvb, offset, 4); if (uuid.bt_uuid) { sub_item = proto_tree_add_item(entry_tree, hf_btcommon_eir_ad_uuid_32, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_item_append_text(sub_item, " (%s)", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown")); } else { sub_item = proto_tree_add_item(entry_tree, hf_btcommon_eir_ad_custom_uuid_32, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(sub_item, " (%s)", print_uuid(&uuid)); + proto_item_append_text(sub_item, " (%s)", print_bluetooth_uuid(&uuid)); } offset += 4; @@ -9045,14 +9045,14 @@ dissect_eir_ad_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, bluetoo case 0x15: /* List of 128-bit Service Solicitation UUIDs */ end_offset = offset + length; while (offset < end_offset) { - uuid = get_uuid(tvb, offset, 16); + uuid = get_bluetooth_uuid(tvb, offset, 16); if (uuid.bt_uuid) { - sub_item = proto_tree_add_bytes_format_value(entry_tree, hf_btcommon_eir_ad_uuid_128, tvb, offset, 16, uuid.data, "%s", print_numeric_uuid(&uuid)); + sub_item = proto_tree_add_bytes_format_value(entry_tree, hf_btcommon_eir_ad_uuid_128, tvb, offset, 16, uuid.data, "%s", print_numeric_bluetooth_uuid(&uuid)); proto_item_append_text(sub_item, " (%s)", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown")); } else { - sub_item = proto_tree_add_bytes_format_value(entry_tree, hf_btcommon_eir_ad_custom_uuid_128, tvb, offset, 16, uuid.data, "%s", print_numeric_uuid(&uuid)); - proto_item_append_text(sub_item, " (%s)", print_uuid(&uuid)); + sub_item = proto_tree_add_bytes_format_value(entry_tree, hf_btcommon_eir_ad_custom_uuid_128, tvb, offset, 16, uuid.data, "%s", print_numeric_bluetooth_uuid(&uuid)); + proto_item_append_text(sub_item, " (%s)", print_bluetooth_uuid(&uuid)); } offset += 16; @@ -9174,7 +9174,7 @@ dissect_eir_ad_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, bluetoo offset += 2; if (length - 2 > 0) { - uuid = get_uuid(tvb, offset-2, 2); + uuid = get_bluetooth_uuid(tvb, offset-2, 2); /* XXX A dissector table should be used here if we get many of these*/ if (uuid.bt_uuid == 0xFD6F) /* GAEN Identifier */ { @@ -9188,14 +9188,14 @@ dissect_eir_ad_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, bluetoo } break; case 0x20: /* Service Data - 32 bit UUID */ - uuid = get_uuid(tvb, offset, 4); + uuid = get_bluetooth_uuid(tvb, offset, 4); if (uuid.bt_uuid) { sub_item = proto_tree_add_item(entry_tree, hf_btcommon_eir_ad_uuid_32, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_item_append_text(sub_item, " (%s)", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown")); } else { sub_item = proto_tree_add_item(entry_tree, hf_btcommon_eir_ad_custom_uuid_32, tvb, offset, 4, ENC_LITTLE_ENDIAN); - proto_item_append_text(sub_item, " (%s)", print_uuid(&uuid)); + proto_item_append_text(sub_item, " (%s)", print_bluetooth_uuid(&uuid)); } offset += 4; @@ -9205,14 +9205,14 @@ dissect_eir_ad_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, bluetoo } break; case 0x21: /* Service Data - 128 bit UUID */ - uuid = get_uuid(tvb, offset, 16); + uuid = get_bluetooth_uuid(tvb, offset, 16); if (uuid.bt_uuid) { - sub_item = proto_tree_add_bytes_format_value(entry_tree, hf_btcommon_eir_ad_uuid_128, tvb, offset, 16, uuid.data, "%s", print_numeric_uuid(&uuid)); + sub_item = proto_tree_add_bytes_format_value(entry_tree, hf_btcommon_eir_ad_uuid_128, tvb, offset, 16, uuid.data, "%s", print_numeric_bluetooth_uuid(&uuid)); proto_item_append_text(sub_item, " (%s)", val_to_str_ext_const(uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown")); } else { - sub_item = proto_tree_add_bytes_format_value(entry_tree, hf_btcommon_eir_ad_custom_uuid_128, tvb, offset, 16, uuid.data, "%s", print_numeric_uuid(&uuid)); - proto_item_append_text(sub_item, " (%s)", print_uuid(&uuid)); + sub_item = proto_tree_add_bytes_format_value(entry_tree, hf_btcommon_eir_ad_custom_uuid_128, tvb, offset, 16, uuid.data, "%s", print_numeric_bluetooth_uuid(&uuid)); + proto_item_append_text(sub_item, " (%s)", print_bluetooth_uuid(&uuid)); } offset += 16; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index d28201f25f..fcd8ef237d 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -1455,7 +1455,7 @@ dissect_bthci_evt_connect_complete(tvbuff_t *tvb, int offset, packet_info *pinfo chandle_session = (chandle_session_t *) wmem_new(wmem_file_scope(), chandle_session_t); chandle_session->connect_in_frame = k_frame_number; - chandle_session->disconnect_in_frame = max_disconnect_in_frame; + chandle_session->disconnect_in_frame = bluetooth_max_disconnect_in_frame; chandle_session->link_type = BT_LINK_TYPE_ACL; wmem_tree_insert32_array(bluetooth_data->chandle_sessions, key, chandle_session); @@ -2565,7 +2565,7 @@ dissect_bthci_evt_le_meta(tvbuff_t *tvb, int offset, packet_info *pinfo, chandle_session = (chandle_session_t *) wmem_new(wmem_file_scope(), chandle_session_t); chandle_session->connect_in_frame = k_frame_number; - chandle_session->disconnect_in_frame = max_disconnect_in_frame; + chandle_session->disconnect_in_frame = bluetooth_max_disconnect_in_frame; chandle_session->link_type = BT_LINK_TYPE_LL; wmem_tree_insert32_array(bluetooth_data->chandle_sessions, key, chandle_session); } @@ -2775,7 +2775,7 @@ dissect_bthci_evt_le_meta(tvbuff_t *tvb, int offset, packet_info *pinfo, chandle_session = (chandle_session_t *) wmem_new(wmem_file_scope(), chandle_session_t); chandle_session->connect_in_frame = k_frame_number; - chandle_session->disconnect_in_frame = max_disconnect_in_frame; + chandle_session->disconnect_in_frame = bluetooth_max_disconnect_in_frame; chandle_session->link_type = BT_LINK_TYPE_LL; wmem_tree_insert32_array(bluetooth_data->chandle_sessions, key, chandle_session); } @@ -3086,7 +3086,7 @@ dissect_bthci_evt_le_meta(tvbuff_t *tvb, int offset, packet_info *pinfo, chandle_session = (chandle_session_t *) wmem_new(wmem_file_scope(), chandle_session_t); chandle_session->connect_in_frame = k_frame_number; - chandle_session->disconnect_in_frame = max_disconnect_in_frame; + chandle_session->disconnect_in_frame = bluetooth_max_disconnect_in_frame; chandle_session->link_type = BT_LINK_TYPE_ISO; wmem_tree_insert32_array(bluetooth_data->chandle_sessions, key, chandle_session); } @@ -5927,7 +5927,7 @@ dissect_bthci_evt_sync_connection_complete(tvbuff_t *tvb, int offset, /* chandle session */ chandle_session = (chandle_session_t *) wmem_new(wmem_file_scope(), chandle_session_t); chandle_session->connect_in_frame = frame_number; - chandle_session->disconnect_in_frame = max_disconnect_in_frame; + chandle_session->disconnect_in_frame = bluetooth_max_disconnect_in_frame; chandle_session->link_type = BT_LINK_TYPE_SCO; wmem_tree_insert32_array(bluetooth_data->chandle_sessions, key, chandle_session); @@ -6710,16 +6710,16 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat if (bthci_cmd_data && bthci_cmd_data->command_in_frame < frame_number && ( (opcode_list_data->command_status == COMMAND_STATUS_NORMAL && (bthci_cmd_data->response_in_frame == frame_number || - bthci_cmd_data->response_in_frame == max_disconnect_in_frame)) || + bthci_cmd_data->response_in_frame == bluetooth_max_disconnect_in_frame)) || (opcode_list_data->command_status == COMMAND_STATUS_PENDING && (bthci_cmd_data->pending_in_frame == frame_number || - ((bthci_cmd_data->response_in_frame == max_disconnect_in_frame || + ((bthci_cmd_data->response_in_frame == bluetooth_max_disconnect_in_frame || bthci_cmd_data->response_in_frame > frame_number) && - bthci_cmd_data->pending_in_frame == max_disconnect_in_frame))) || + bthci_cmd_data->pending_in_frame == bluetooth_max_disconnect_in_frame))) || (opcode_list_data->command_status == COMMAND_STATUS_RESULT && (bthci_cmd_data->response_in_frame == frame_number || - ((bthci_cmd_data->response_in_frame == max_disconnect_in_frame && - bthci_cmd_data->pending_in_frame == max_disconnect_in_frame)))) + ((bthci_cmd_data->response_in_frame == bluetooth_max_disconnect_in_frame && + bthci_cmd_data->pending_in_frame == bluetooth_max_disconnect_in_frame)))) )) { lastest_bthci_cmd_data = bthci_cmd_data; if (((opcode_list_data->command_status == COMMAND_STATUS_RESULT || @@ -6978,20 +6978,20 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } if (!pinfo->fd->visited && opcode_list_data->command_status == COMMAND_STATUS_PENDING && - lastest_bthci_cmd_data->pending_in_frame == max_disconnect_in_frame) { + lastest_bthci_cmd_data->pending_in_frame == bluetooth_max_disconnect_in_frame) { lastest_bthci_cmd_data->pending_in_frame = frame_number; lastest_bthci_cmd_data->pending_abs_ts = pinfo->abs_ts; } if (!pinfo->fd->visited && opcode_list_data->command_status == COMMAND_STATUS_NORMAL && - lastest_bthci_cmd_data->response_in_frame == max_disconnect_in_frame) { + lastest_bthci_cmd_data->response_in_frame == bluetooth_max_disconnect_in_frame) { lastest_bthci_cmd_data->response_in_frame = frame_number; lastest_bthci_cmd_data->response_abs_ts = pinfo->abs_ts; } if (!pinfo->fd->visited && opcode_list_data->command_status == COMMAND_STATUS_RESULT && - lastest_bthci_cmd_data->response_in_frame == max_disconnect_in_frame && - lastest_bthci_cmd_data->pending_in_frame == max_disconnect_in_frame) { + lastest_bthci_cmd_data->response_in_frame == bluetooth_max_disconnect_in_frame && + lastest_bthci_cmd_data->pending_in_frame == bluetooth_max_disconnect_in_frame) { lastest_bthci_cmd_data->response_in_frame = frame_number; lastest_bthci_cmd_data->response_abs_ts = pinfo->abs_ts; } @@ -7000,7 +7000,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat sub_item = proto_tree_add_uint(bthci_evt_tree, hf_command_in_frame, tvb, 0, 0, lastest_bthci_cmd_data->command_in_frame); proto_item_set_generated(sub_item); - if (lastest_bthci_cmd_data->response_in_frame < max_disconnect_in_frame) { + if (lastest_bthci_cmd_data->response_in_frame < bluetooth_max_disconnect_in_frame) { sub_item = proto_tree_add_uint(bthci_evt_tree, hf_response_in_frame, tvb, 0, 0, lastest_bthci_cmd_data->response_in_frame); proto_item_set_generated(sub_item); } @@ -7009,7 +7009,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat sub_item = proto_tree_add_double(bthci_evt_tree, hf_command_pending_time_delta, tvb, 0, 0, nstime_to_msec(&delta)); proto_item_set_generated(sub_item); - if (lastest_bthci_cmd_data->response_in_frame < max_disconnect_in_frame) { + if (lastest_bthci_cmd_data->response_in_frame < bluetooth_max_disconnect_in_frame) { nstime_delta(&delta, &lastest_bthci_cmd_data->response_abs_ts, &lastest_bthci_cmd_data->pending_abs_ts); sub_item = proto_tree_add_double(bthci_evt_tree, hf_pending_response_time_delta, tvb, 0, 0, nstime_to_msec(&delta)); proto_item_set_generated(sub_item); @@ -7020,7 +7020,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat sub_item = proto_tree_add_uint(bthci_evt_tree, hf_command_in_frame, tvb, 0, 0, lastest_bthci_cmd_data->command_in_frame); proto_item_set_generated(sub_item); - if (lastest_bthci_cmd_data->pending_in_frame < max_disconnect_in_frame) { + if (lastest_bthci_cmd_data->pending_in_frame < bluetooth_max_disconnect_in_frame) { sub_item = proto_tree_add_uint(bthci_evt_tree, hf_pending_in_frame, tvb, 0, 0, lastest_bthci_cmd_data->pending_in_frame); proto_item_set_generated(sub_item); diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 02b4ac8588..6e7ce41a14 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -726,7 +726,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, psm_data->adapter_id = k_adapter_id; psm_data->chandle = k_chandle; psm_data->connect_in_frame = pinfo->num; - psm_data->disconnect_in_frame = max_disconnect_in_frame; + psm_data->disconnect_in_frame = bluetooth_max_disconnect_in_frame; key[0].length = 1; key[0].key = &k_interface_id; @@ -801,7 +801,7 @@ dissect_connrequest(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_item_set_generated(sub_item); } - if (disconnect_in_frame < max_disconnect_in_frame) { + if (disconnect_in_frame < bluetooth_max_disconnect_in_frame) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_disconnect_in_frame, tvb, 0, 0, disconnect_in_frame); proto_item_set_generated(sub_item); } @@ -881,7 +881,7 @@ dissect_le_credit_based_connrequest(tvbuff_t *tvb, int offset, packet_info *pinf psm_data->adapter_id = k_adapter_id; psm_data->chandle = k_chandle; psm_data->connect_in_frame = pinfo->num; - psm_data->disconnect_in_frame = max_disconnect_in_frame; + psm_data->disconnect_in_frame = bluetooth_max_disconnect_in_frame; key[0].length = 1; key[0].key = &k_interface_id; @@ -967,7 +967,7 @@ dissect_le_credit_based_connrequest(tvbuff_t *tvb, int offset, packet_info *pinf proto_item_set_generated(sub_item); } - if (disconnect_in_frame < max_disconnect_in_frame) { + if (disconnect_in_frame < bluetooth_max_disconnect_in_frame) { sub_item = proto_tree_add_uint(tree, hf_btl2cap_disconnect_in_frame, tvb, 0, 0, disconnect_in_frame); proto_item_set_generated(sub_item); } @@ -1811,7 +1811,7 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, psm_data->adapter_id == adapter_id && psm_data->chandle == chandle && psm_data->remote_cid == key_dcid && - psm_data->disconnect_in_frame == max_disconnect_in_frame) + psm_data->disconnect_in_frame == bluetooth_max_disconnect_in_frame) { psm_data->disconnect_in_frame = pinfo->num; } @@ -1841,7 +1841,7 @@ dissect_disconnrequestresponse(tvbuff_t *tvb, int offset, packet_info *pinfo, psm_data->adapter_id == adapter_id && psm_data->chandle == chandle && psm_data->local_cid == key_scid && - psm_data->disconnect_in_frame == max_disconnect_in_frame) + psm_data->disconnect_in_frame == bluetooth_max_disconnect_in_frame) { psm_data->disconnect_in_frame = pinfo->num; } @@ -1982,7 +1982,7 @@ dissect_b_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (bt_uuid && p_get_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID) == NULL) { gchar *value_data; - value_data = wmem_strdup(wmem_file_scope(), print_numeric_uuid(&uuid)); + value_data = wmem_strdup(wmem_file_scope(), print_numeric_bluetooth_uuid(&uuid)); p_add_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID, value_data); } @@ -2002,7 +2002,7 @@ dissect_b_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!dissector_try_uint_new(l2cap_cid_dissector_table, (guint32) cid, next_tvb, pinfo, tree, TRUE, l2cap_data)) { if (!dissector_try_uint_new(l2cap_psm_dissector_table, (guint32) psm, next_tvb, pinfo, tree, TRUE, l2cap_data)) { /* not a known fixed PSM, try to find a registered service to a dynamic PSM */ - if (!dissector_try_string(bluetooth_uuid_table, print_numeric_uuid(&uuid), next_tvb, pinfo, tree, l2cap_data)) { + if (!dissector_try_string(bluetooth_uuid_table, print_numeric_bluetooth_uuid(&uuid), next_tvb, pinfo, tree, l2cap_data)) { /* unknown protocol. declare as data */ proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, ENC_NA); } @@ -2099,7 +2099,7 @@ dissect_le_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (bt_uuid && p_get_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID) == NULL) { gchar *value_data; - value_data = wmem_strdup(wmem_file_scope(), print_numeric_uuid(&uuid)); + value_data = wmem_strdup(wmem_file_scope(), print_numeric_bluetooth_uuid(&uuid)); p_add_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID, value_data); } @@ -2141,7 +2141,7 @@ dissect_le_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (!dissector_try_uint_new(l2cap_cid_dissector_table, (guint32)cid, new_tvb, pinfo, tree, TRUE, l2cap_data)) { if (!dissector_try_uint_new(l2cap_psm_dissector_table, (guint32)psm, new_tvb, pinfo, tree, TRUE, l2cap_data)) { /* not a known fixed PSM, try to find a registered service to a dynamic PSM */ - if (!dissector_try_string(bluetooth_uuid_table, print_numeric_uuid(&uuid), new_tvb, pinfo, tree, l2cap_data)) { + if (!dissector_try_string(bluetooth_uuid_table, print_numeric_bluetooth_uuid(&uuid), new_tvb, pinfo, tree, l2cap_data)) { /* unknown protocol. declare as data */ proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, ENC_NA); } @@ -2307,7 +2307,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (bt_uuid && p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BLUETOOTH_SERVICE_UUID) == NULL) { gchar *value_data; - value_data = wmem_strdup(wmem_file_scope(), print_numeric_uuid(&uuid)); + value_data = wmem_strdup(wmem_file_scope(), print_numeric_bluetooth_uuid(&uuid)); p_add_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BLUETOOTH_SERVICE_UUID, value_data); } @@ -2325,7 +2325,7 @@ dissect_i_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* call next dissector */ if (!dissector_try_uint_new(l2cap_psm_dissector_table, (guint32) psm, next_tvb, pinfo, tree, TRUE, l2cap_data)) { /* not a known fixed PSM, try to find a registered service to a dynamic PSM */ - if (!dissector_try_string(bluetooth_uuid_table, print_numeric_uuid(&uuid), next_tvb, pinfo, tree, l2cap_data)) { + if (!dissector_try_string(bluetooth_uuid_table, print_numeric_bluetooth_uuid(&uuid), next_tvb, pinfo, tree, l2cap_data)) { /* unknown protocol. declare as data */ proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, next_tvb, 0, tvb_reported_length(next_tvb), ENC_NA); } @@ -2462,14 +2462,14 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) l2cap_data->remote_bd_addr_id = acl_data->remote_bd_addr_id; } else { l2cap_data->adapter_id = HCI_ADAPTER_DEFAULT; - l2cap_data->adapter_disconnect_in_frame = &max_disconnect_in_frame; + l2cap_data->adapter_disconnect_in_frame = &bluetooth_max_disconnect_in_frame; l2cap_data->chandle = 0; - l2cap_data->hci_disconnect_in_frame = &max_disconnect_in_frame; + l2cap_data->hci_disconnect_in_frame = &bluetooth_max_disconnect_in_frame; l2cap_data->remote_bd_addr_oui = 0; l2cap_data->remote_bd_addr_id = 0; } - l2cap_data->disconnect_in_frame = &max_disconnect_in_frame; + l2cap_data->disconnect_in_frame = &bluetooth_max_disconnect_in_frame; l2cap_data->cid = cid; l2cap_data->local_cid = BTL2CAP_UNKNOWN_CID; @@ -2634,7 +2634,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) l2cap_data->remote_cid = cid; } l2cap_data->psm = psm; - l2cap_data->disconnect_in_frame = &max_disconnect_in_frame; + l2cap_data->disconnect_in_frame = &bluetooth_max_disconnect_in_frame; if (p_get_proto_data(pinfo->pool, pinfo, proto_btl2cap, PROTO_DATA_BTL2CAP_PSM ) == NULL) { guint16 *value_data; @@ -2666,12 +2666,12 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (bt_uuid && p_get_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID ) == NULL) { gchar* value_data; - value_data = wmem_strdup(wmem_file_scope(), print_numeric_uuid(&uuid)); + value_data = wmem_strdup(wmem_file_scope(), print_numeric_bluetooth_uuid(&uuid)); p_add_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID, value_data); } - if (!dissector_try_string(bluetooth_uuid_table, print_numeric_uuid(&uuid), next_tvb, pinfo, tree, l2cap_data)) { + if (!dissector_try_string(bluetooth_uuid_table, print_numeric_bluetooth_uuid(&uuid), next_tvb, pinfo, tree, l2cap_data)) { /* unknown protocol. declare as data */ proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, ENC_NA); } diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index 26cea82c7b..cff10eabbd 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -2616,8 +2616,8 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) acl_data->remote_bd_addr_id = 0; acl_data->is_btle = TRUE; acl_data->is_btle_retransmit = retransmit; - acl_data->adapter_disconnect_in_frame = &max_disconnect_in_frame; - acl_data->disconnect_in_frame = &max_disconnect_in_frame; + acl_data->adapter_disconnect_in_frame = &bluetooth_max_disconnect_in_frame; + acl_data->disconnect_in_frame = &bluetooth_max_disconnect_in_frame; next_tvb = tvb_new_subset_length(tvb, offset, length); if (next_tvb) { @@ -2699,8 +2699,8 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) acl_data->remote_bd_addr_id = 0; acl_data->is_btle = TRUE; acl_data->is_btle_retransmit = retransmit; - acl_data->adapter_disconnect_in_frame = &max_disconnect_in_frame; - acl_data->disconnect_in_frame = &max_disconnect_in_frame; + acl_data->adapter_disconnect_in_frame = &bluetooth_max_disconnect_in_frame; + acl_data->disconnect_in_frame = &bluetooth_max_disconnect_in_frame; next_tvb = tvb_new_subset_length(tvb, offset, length); call_dissector_with_data(btl2cap_handle, next_tvb, pinfo, tree, acl_data); diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 0a3faca9df..06f008f01e 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -656,7 +656,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data subtree = (wmem_tree_t *) wmem_tree_lookup32_array(service_directions, key); service_direction = (subtree) ? (service_direction_t *) wmem_tree_lookup32_le(subtree, k_frame_number) : NULL; - if (service_direction && service_direction->end_in == max_disconnect_in_frame) { + if (service_direction && service_direction->end_in == bluetooth_max_disconnect_in_frame) { service_direction->end_in = k_frame_number; } @@ -667,7 +667,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data service_direction = wmem_new(wmem_file_scope(), service_direction_t); service_direction->direction = (pinfo->p2p_dir == P2P_DIR_RECV) ? P2P_DIR_SENT : P2P_DIR_RECV; - service_direction->end_in = max_disconnect_in_frame; + service_direction->end_in = bluetooth_max_disconnect_in_frame; wmem_tree_insert32_array(service_directions, key, service_direction); } @@ -736,7 +736,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data val_to_str_const(frame_type, vs_frame_type_short, "Unknown"), dlci >> 1); if (dlci && (frame_type == FRAME_TYPE_SABM) && service_info) { if (service_info->uuid.size==16) - col_append_fstr(pinfo->cinfo, COL_INFO, "(UUID128: %s) ", print_uuid(&service_info->uuid)); + col_append_fstr(pinfo->cinfo, COL_INFO, "(UUID128: %s) ", print_bluetooth_uuid(&service_info->uuid)); else col_append_fstr(pinfo->cinfo, COL_INFO, "(%s) ", val_to_str_ext_const(service_info->uuid.bt_uuid, &bluetooth_uuid_vals_ext, "Unknown")); @@ -845,7 +845,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data p_get_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID) == NULL) { guint8 *value_data; - value_data = wmem_strdup(wmem_file_scope(), print_numeric_uuid(&service_info->uuid)); + value_data = wmem_strdup(wmem_file_scope(), print_numeric_bluetooth_uuid(&service_info->uuid)); p_add_proto_data(pinfo->pool, pinfo, proto_bluetooth, PROTO_DATA_BLUETOOTH_SERVICE_UUID, value_data); } @@ -853,7 +853,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (!dissector_try_uint_new(rfcomm_dlci_dissector_table, (guint32) dlci, next_tvb, pinfo, tree, TRUE, rfcomm_data)) { if (service_info && (service_info->uuid.size == 0 || - !dissector_try_string(bluetooth_uuid_table, print_numeric_uuid(&service_info->uuid), + !dissector_try_string(bluetooth_uuid_table, print_numeric_bluetooth_uuid(&service_info->uuid), next_tvb, pinfo, tree, rfcomm_data))) { decode_by_dissector = find_proto_by_channel(dlci >> 1); if (rfcomm_channels_enabled && decode_by_dissector) { diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 14c731687d..76085faed2 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -1151,7 +1151,7 @@ get_specified_uuid(wmem_array_t *uuid_array) break; if (p_uuid->size == 0) continue; - if (dissector_get_string_handle(bluetooth_uuid_table, print_numeric_uuid(p_uuid))) + if (dissector_get_string_handle(bluetooth_uuid_table, print_numeric_bluetooth_uuid(p_uuid))) break; } @@ -1396,9 +1396,9 @@ dissect_uuid(proto_tree *tree, tvbuff_t *tvb, gint offset, gint size, bluetooth_ bluetooth_uuid_t x_uuid; item = proto_tree_add_item(tree, hf_data_element_value_uuid, tvb, offset, size, ENC_NA); - x_uuid = get_uuid(tvb, offset, size); + x_uuid = get_bluetooth_uuid(tvb, offset, size); - proto_item_append_text(item, " (%s)", print_uuid(&x_uuid)); + proto_item_append_text(item, " (%s)", print_bluetooth_uuid(&x_uuid)); uuid->bt_uuid = 0; } @@ -2013,7 +2013,7 @@ dissect_protocol_descriptor_list(proto_tree *next_tree, tvbuff_t *tvb, dissect_uuid(sub_tree, tvb, entry_offset, length, &uuid); - uuid_str = print_uuid(&uuid); + uuid_str = print_bluetooth_uuid(&uuid); wmem_strbuf_append(info_buf, uuid_str); proto_item_append_text(feature_item, ": %s", uuid_str); proto_item_append_text(entry_item, ": %s", uuid_str); @@ -3307,7 +3307,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, dissect_uuid(entry_tree, tvb, list_offset, list_length, &uuid); - wmem_strbuf_append(info_buf, print_uuid(&uuid)); + wmem_strbuf_append(info_buf, print_bluetooth_uuid(&uuid)); list_offset += list_length; if (list_offset - offset < size) @@ -3321,7 +3321,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, break; case 0x003: dissect_uuid(next_tree, tvb, offset, size, &uuid); - wmem_strbuf_append(info_buf, print_uuid(&uuid)); + wmem_strbuf_append(info_buf, print_bluetooth_uuid(&uuid)); break; case 0x004: protocol_order = 0; @@ -3336,7 +3336,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, dissect_uuid(entry_tree, tvb, list_offset, list_length, &uuid); - wmem_strbuf_append(info_buf, print_uuid(&uuid)); + wmem_strbuf_append(info_buf, print_bluetooth_uuid(&uuid)); list_offset += list_length; if (list_offset - offset < size) @@ -3405,7 +3405,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, dissect_uuid(sub_tree, tvb, entry_offset, entry_length, &uuid); - uuid_str = print_uuid(&uuid); + uuid_str = print_bluetooth_uuid(&uuid); wmem_strbuf_append(info_buf, uuid_str); proto_item_append_text(entry_item, ": %s", uuid_str); @@ -3499,7 +3499,7 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, } case 3: dissect_uuid(next_tree, tvb, offset, size, &uuid); - wmem_strbuf_append_printf(info_buf, ": %s", print_uuid(&uuid)); + wmem_strbuf_append_printf(info_buf, ": %s", print_bluetooth_uuid(&uuid)); break; case 8: /* fall through */ case 4: { @@ -4020,7 +4020,7 @@ dissect_sdp_service_attribute_list(proto_tree *tree, tvbuff_t *tvb, gint offset, if (uuid.size) proto_item_append_text(list_tree, " [count = %2u] (%s%s)", - number_of_attributes, (uuid.bt_uuid) ? "" : "CustomUUID: ", print_uuid(&uuid)); + number_of_attributes, (uuid.bt_uuid) ? "" : "CustomUUID: ", print_bluetooth_uuid(&uuid)); else proto_item_append_text(list_tree, " [count = %2u]", number_of_attributes); diff --git a/epan/dissectors/packet-hci_mon.c b/epan/dissectors/packet-hci_mon.c index e9a8b07bae..87ab05a574 100644 --- a/epan/dissectors/packet-hci_mon.c +++ b/epan/dissectors/packet-hci_mon.c @@ -324,7 +324,7 @@ dissect_hci_mon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) if (adapter_disconnect_in_frame) { bluetooth_data->adapter_disconnect_in_frame = adapter_disconnect_in_frame; } else { - bluetooth_data->adapter_disconnect_in_frame = &max_disconnect_in_frame; + bluetooth_data->adapter_disconnect_in_frame = &bluetooth_max_disconnect_in_frame; } pinfo->ptype = PT_BLUETOOTH; diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index 799070b8d8..e3ed45944e 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -158,7 +158,7 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) bluetooth_data->adapter_id = usb_conv_info->bus_id << 8 | usb_conv_info->device_address; /* TODO: adapter disconnect on some USB action, for now do not support adapter disconnection */ - bluetooth_data->adapter_disconnect_in_frame = &max_disconnect_in_frame; + bluetooth_data->adapter_disconnect_in_frame = &bluetooth_max_disconnect_in_frame; next_tvb = tvb_new_subset_remaining(tvb, offset); if (!pinfo->fd->visited && usb_conv_info->endpoint <= 0x02 && diff --git a/packaging/debian/libwireshark0.symbols b/packaging/debian/libwireshark0.symbols index 4e06c8ce3d..1c9d6ec93f 100644 --- a/packaging/debian/libwireshark0.symbols +++ b/packaging/debian/libwireshark0.symbols @@ -1118,18 +1118,18 @@ libwireshark.so.0 libwireshark0 #MINVER# prefs_set_string_value@Base 2.3.0 prefs_set_uint_value@Base 2.3.0 prime_epan_dissect_with_postdissector_wanted_hfids@Base 2.3.0 + print_bluetooth_uuid@Base 3.7.0 print_bookmark@Base 1.12.0~rc1 print_finale@Base 1.12.0~rc1 print_hex_data@Base 1.12.0~rc1 print_line@Base 1.12.0~rc1 print_line_color@Base 2.5.0 + print_numeric_bluetooth_uuid@Base 3.7.0 print_preamble@Base 1.12.0~rc1 print_stream_ps_new@Base 1.12.0~rc1 print_stream_ps_stdio_new@Base 1.12.0~rc1 print_stream_text_new@Base 1.12.0~rc1 print_stream_text_stdio_new@Base 1.12.0~rc1 - print_uuid@Base 2.0.0 - print_numeric_uuid@Base 2.0.0 process_reassembled_data@Base 1.9.1 process_stat_cmd_arg@Base 1.9.1 proto_all_finfos@Base 1.9.1 diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp index 16e8149eef..8f10493903 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp +++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp @@ -282,8 +282,8 @@ tap_packet_status BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_pt } handle = QString("0x%1").arg(tap_handles->handle, 4, 16, QChar('0')); - uuid = QString(print_numeric_uuid(&tap_handles->uuid)); - uuid_name = QString(print_uuid(&tap_handles->uuid)); + uuid = QString(print_numeric_bluetooth_uuid(&tap_handles->uuid)); + uuid_name = QString(print_bluetooth_uuid(&tap_handles->uuid)); if (dialog->ui->removeDuplicatesCheckBox->checkState() == Qt::Checked) { QTreeWidgetItemIterator i_item(dialog->ui->tableTreeWidget);