diff options
Diffstat (limited to 'epan/dissectors/packet-btbredr_rf.c')
| -rw-r--r-- | epan/dissectors/packet-btbredr_rf.c | 886 |
1 files changed, 443 insertions, 443 deletions
diff --git a/epan/dissectors/packet-btbredr_rf.c b/epan/dissectors/packet-btbredr_rf.c index a19a3457..dd05a564 100644 --- a/epan/dissectors/packet-btbredr_rf.c +++ b/epan/dissectors/packet-btbredr_rf.c @@ -30,113 +30,113 @@ * - De-Whiten if the capture hardware did not already do it and we have the UAP */ -static int proto_btbredr_rf = -1; -static int proto_btbredr_fhs = -1; - -static int hf_rf_channel = -1; -static int hf_uncertain_rf_channel = -1; -static int hf_signal_power = -1; -static int hf_invalid_signal_power = -1; -static int hf_noise_power = -1; -static int hf_invalid_noise_power = -1; -static int hf_access_address_offenses = -1; -static int hf_payload_transport_rate = -1; -static int hf_payload_transport_rate_payload = -1; -static int hf_payload_transport_rate_transport = -1; -static int hf_payload_transport_rate_ignored = -1; -static int hf_corrected_header_bits = -1; -static int hf_corrected_payload_bits = -1; -static int hf_lower_address_part = -1; -static int hf_reference_lower_address_part = -1; -static int hf_invalid_reference_lower_address_part = -1; -static int hf_reference_upper_addres_part = -1; -static int hf_invalid_reference_upper_addres_part = -1; -static int hf_whitened_packet_header = -1; -static int hf_invalid_packet_header = -1; -static int hf_packet_header = -1; -static int hf_packet_header_reserved = -1; -static int hf_packet_header_lt_addr = -1; -static int hf_packet_header_type = -1; -static int hf_packet_header_type_any = -1; -static int hf_packet_header_type_sco_br = -1; -static int hf_packet_header_type_esco_br = -1; -static int hf_packet_header_type_esco_edr = -1; -static int hf_packet_header_type_acl_br = -1; -static int hf_packet_header_type_acl_edr = -1; -static int hf_packet_header_type_csb_br = -1; -static int hf_packet_header_type_csb_edr = -1; -static int hf_packet_header_flow_control = -1; -static int hf_packet_header_acknowledge_indication = -1; -static int hf_packet_header_sequence_number = -1; -static int hf_packet_header_header_error_check = -1; -static int hf_packet_header_broken_lt_addr = -1; -static int hf_packet_header_broken_type = -1; -static int hf_packet_header_broken_type_any = -1; -static int hf_packet_header_broken_type_sco_br = -1; -static int hf_packet_header_broken_type_esco_br = -1; -static int hf_packet_header_broken_type_esco_edr = -1; -static int hf_packet_header_broken_type_acl_br = -1; -static int hf_packet_header_broken_type_acl_edr = -1; -static int hf_packet_header_broken_type_csb_br = -1; -static int hf_packet_header_broken_type_csb_edr = -1; -static int hf_packet_header_broken_flow_control = -1; -static int hf_packet_header_broken_acknowledge_indication = -1; -static int hf_packet_header_broken_sequence_number = -1; -static int hf_packet_header_broken_header_error_check = -1; -static int hf_flags = -1; -static int hf_flags_reserved_15_14 = -1; -static int hf_flags_mic_pass = -1; -static int hf_flags_mic_checked = -1; -static int hf_flags_crc_pass = -1; -static int hf_flags_crc_checked = -1; -static int hf_flags_hec_pass = -1; -static int hf_flags_hec_checked = -1; -static int hf_flags_reference_upper_addres_part_valid = -1; -static int hf_flags_rf_channel_aliasing = -1; -static int hf_flags_br_edr_data_present = -1; -static int hf_flags_reference_lower_address_part_valid = -1; -static int hf_flags_bredr_payload_decrypted = -1; -static int hf_flags_noise_power_valid = -1; -static int hf_flags_signal_power_valid = -1; -static int hf_flags_packet_header_and_br_edr_payload_dewhitened = -1; -static int hf_whitened_data = -1; -static int hf_encrypted_data = -1; -static int hf_data = -1; -static int hf_isochronous_data = -1; -static int hf_asynchronous_data = -1; -static int hf_l2cap_fragment = -1; -static int hf_crc = -1; -static int hf_payload_header2 = -1; -static int hf_payload_header2_llid = -1; -static int hf_payload_header2_flow = -1; -static int hf_payload_header2_length = -1; -static int hf_payload_header2_rfu = -1; -static int hf_payload_header1 = -1; -static int hf_payload_header1_llid = -1; -static int hf_payload_header1_flow = -1; -static int hf_payload_header1_length = -1; -static int hf_l2cap_msg_fragments = -1; -static int hf_l2cap_msg_fragment = -1; -static int hf_l2cap_msg_fragment_overlap = -1; -static int hf_l2cap_msg_fragment_overlap_conflicts = -1; -static int hf_l2cap_msg_fragment_multiple_tails = -1; -static int hf_l2cap_msg_fragment_too_long_fragment = -1; -static int hf_l2cap_msg_fragment_error = -1; -static int hf_l2cap_msg_fragment_count = -1; -static int hf_l2cap_msg_reassembled_in = -1; -static int hf_l2cap_msg_reassembled_length = -1; -static int hf_fhs_parity = -1; -static int hf_fhs_lap = -1; -static int hf_fhs_eir = -1; -static int hf_fhs_reserved = -1; -static int hf_fhs_sr = -1; -static int hf_fhs_sp = -1; -static int hf_fhs_uap = -1; -static int hf_fhs_nap = -1; -static int hf_fhs_class = -1; -static int hf_fhs_ltaddr = -1; -static int hf_fhs_clk = -1; -static int hf_fhs_pagescanmode = -1; +static int proto_btbredr_rf; +static int proto_btbredr_fhs; + +static int hf_rf_channel; +static int hf_uncertain_rf_channel; +static int hf_signal_power; +static int hf_invalid_signal_power; +static int hf_noise_power; +static int hf_invalid_noise_power; +static int hf_access_address_offenses; +static int hf_payload_transport_rate; +static int hf_payload_transport_rate_payload; +static int hf_payload_transport_rate_transport; +static int hf_payload_transport_rate_ignored; +static int hf_corrected_header_bits; +static int hf_corrected_payload_bits; +static int hf_lower_address_part; +static int hf_reference_lower_address_part; +static int hf_invalid_reference_lower_address_part; +static int hf_reference_upper_addres_part; +static int hf_invalid_reference_upper_addres_part; +static int hf_whitened_packet_header; +static int hf_invalid_packet_header; +static int hf_packet_header; +static int hf_packet_header_reserved; +static int hf_packet_header_lt_addr; +static int hf_packet_header_type; +static int hf_packet_header_type_any; +static int hf_packet_header_type_sco_br; +static int hf_packet_header_type_esco_br; +static int hf_packet_header_type_esco_edr; +static int hf_packet_header_type_acl_br; +static int hf_packet_header_type_acl_edr; +static int hf_packet_header_type_cpb_br; +static int hf_packet_header_type_cpb_edr; +static int hf_packet_header_flow_control; +static int hf_packet_header_acknowledge_indication; +static int hf_packet_header_sequence_number; +static int hf_packet_header_header_error_check; +static int hf_packet_header_broken_lt_addr; +static int hf_packet_header_broken_type; +static int hf_packet_header_broken_type_any; +static int hf_packet_header_broken_type_sco_br; +static int hf_packet_header_broken_type_esco_br; +static int hf_packet_header_broken_type_esco_edr; +static int hf_packet_header_broken_type_acl_br; +static int hf_packet_header_broken_type_acl_edr; +static int hf_packet_header_broken_type_cpb_br; +static int hf_packet_header_broken_type_cpb_edr; +static int hf_packet_header_broken_flow_control; +static int hf_packet_header_broken_acknowledge_indication; +static int hf_packet_header_broken_sequence_number; +static int hf_packet_header_broken_header_error_check; +static int hf_flags; +static int hf_flags_reserved_15_14; +static int hf_flags_mic_pass; +static int hf_flags_mic_checked; +static int hf_flags_crc_pass; +static int hf_flags_crc_checked; +static int hf_flags_hec_pass; +static int hf_flags_hec_checked; +static int hf_flags_reference_upper_addres_part_valid; +static int hf_flags_rf_channel_aliasing; +static int hf_flags_br_edr_data_present; +static int hf_flags_reference_lower_address_part_valid; +static int hf_flags_bredr_payload_decrypted; +static int hf_flags_noise_power_valid; +static int hf_flags_signal_power_valid; +static int hf_flags_packet_header_and_br_edr_payload_dewhitened; +static int hf_whitened_data; +static int hf_encrypted_data; +static int hf_data; +static int hf_isochronous_data; +static int hf_asynchronous_data; +static int hf_l2cap_fragment; +static int hf_crc; +static int hf_payload_header2; +static int hf_payload_header2_llid; +static int hf_payload_header2_flow; +static int hf_payload_header2_length; +static int hf_payload_header2_rfu; +static int hf_payload_header1; +static int hf_payload_header1_llid; +static int hf_payload_header1_flow; +static int hf_payload_header1_length; +static int hf_l2cap_msg_fragments; +static int hf_l2cap_msg_fragment; +static int hf_l2cap_msg_fragment_overlap; +static int hf_l2cap_msg_fragment_overlap_conflicts; +static int hf_l2cap_msg_fragment_multiple_tails; +static int hf_l2cap_msg_fragment_too_long_fragment; +static int hf_l2cap_msg_fragment_error; +static int hf_l2cap_msg_fragment_count; +static int hf_l2cap_msg_reassembled_in; +static int hf_l2cap_msg_reassembled_length; +static int hf_fhs_parity; +static int hf_fhs_lap; +static int hf_fhs_eir; +static int hf_fhs_reserved; +static int hf_fhs_sr; +static int hf_fhs_sp; +static int hf_fhs_uap; +static int hf_fhs_nap; +static int hf_fhs_class; +static int hf_fhs_ltaddr; +static int hf_fhs_clk; +static int hf_fhs_pagescanmode; #define FLAGS_MIC_PASS 0x2000 #define FLAGS_MIC_CHECKED 0x1000 @@ -159,33 +159,33 @@ static int * const hfx_payload_transport_rate[] = { NULL }; -static expert_field ei_unexpected_data = EI_INIT; -static expert_field ei_reserved_not_zero = EI_INIT; -static expert_field ei_incorrect_packet_header_or_hec = EI_INIT; -static expert_field ei_packet_header_with_hec_not_checked = EI_INIT; -static expert_field ei_broken_packet_header_format = EI_INIT; -static expert_field ei_incorrect_crc = EI_INIT; -static expert_field ei_missing_fragment_start = EI_INIT; -static expert_field ei_esco_incorrect_ltaddr = EI_INIT; -static expert_field ei_esco_incorrect_length = EI_INIT; - -static gint ett_btbredr_rf = -1; -static gint ett_flags = -1; -static gint ett_payload_transport_rate = -1; -static gint ett_packet_header = -1; -static gint ett_bluetooth_header = -1; -static gint ett_payload_header = -1; -static gint ett_l2cap_msg_fragment = -1; -static gint ett_l2cap_msg_fragments = -1; -static gint ett_btbredr_fhs = -1; +static expert_field ei_unexpected_data; +static expert_field ei_reserved_not_zero; +static expert_field ei_incorrect_packet_header_or_hec; +static expert_field ei_packet_header_with_hec_not_checked; +static expert_field ei_broken_packet_header_format; +static expert_field ei_incorrect_crc; +static expert_field ei_missing_fragment_start; +static expert_field ei_esco_incorrect_ltaddr; +static expert_field ei_esco_incorrect_length; + +static int ett_btbredr_rf; +static int ett_flags; +static int ett_payload_transport_rate; +static int ett_packet_header; +static int ett_bluetooth_header; +static int ett_payload_header; +static int ett_l2cap_msg_fragment; +static int ett_l2cap_msg_fragments; +static int ett_btbredr_fhs; static dissector_table_t packet_type_sco_br_table; static dissector_table_t packet_type_esco_br_table; static dissector_table_t packet_type_esco_edr_table; static dissector_table_t packet_type_acl_br_table; static dissector_table_t packet_type_acl_edr_table; -static dissector_table_t packet_type_csb_br_table; -static dissector_table_t packet_type_csb_edr_table; +static dissector_table_t packet_type_cpb_br_table; +static dissector_table_t packet_type_cpb_edr_table; static dissector_handle_t btlmp_handle; static dissector_handle_t btl2cap_handle; @@ -197,21 +197,21 @@ static wmem_tree_t *connection_info_tree; static wmem_tree_t *device_info_tree; typedef struct _device_info_t { - guint32 interface_id; - guint32 adapter_id; - guint8 bd_addr[6]; - gint8 dir; + uint32_t interface_id; + uint32_t adapter_id; + uint8_t bd_addr[6]; + int8_t dir; } device_info_t; -#define BDADDR_MASTER 0 -#define BDADDR_SLAVE 1 +#define BDADDR_CENTRAL 0 +#define BDADDR_PERIPHERAL 1 typedef struct _btbredr_frame_info_t { - guint retransmit : 1; /* 0 = No, 1 = Retransmitted frame */ - guint ack : 1; /* 0 = Nack, 1 = Ack */ - guint more_fragments : 1; /* 0 = Last fragment, 1 = More fragments */ - guint missing_start : 1; /* 0 = No, 1 = Missing fragment start */ - guint32 l2cap_index; /* Unique identifier for each L2CAP message */ + unsigned retransmit : 1; /* 0 = No, 1 = Retransmitted frame */ + unsigned ack : 1; /* 0 = Nack, 1 = Ack */ + unsigned more_fragments : 1; /* 0 = Last fragment, 1 = More fragments */ + unsigned missing_start : 1; /* 0 = No, 1 = Missing fragment start */ + uint32_t l2cap_index; /* Unique identifier for each L2CAP message */ } btbredr_frame_info_t; typedef struct { @@ -220,7 +220,7 @@ typedef struct { device_info_t *device_info; } btbredr_fhs_data_t; -static const guint8 null_bd_addr[6] = { 0, 0, 0, 0, 0, 0 }; +static const uint8_t null_bd_addr[6] = { 0, 0, 0, 0, 0, 0 }; /* Reassembly */ static reassembly_table l2cap_msg_reassembly_table; @@ -253,7 +253,7 @@ static const value_string payload_transport_rate_transport_vals[] = { { 0x01, "SCO" }, { 0x02, "eSCO" }, { 0x03, "ACL" }, - { 0x04, "CSB" }, + { 0x04, "CPB" }, { 0, NULL } }; @@ -261,7 +261,7 @@ static const value_string payload_transport_rate_transport_vals[] = { #define TRANSPORT_SCO 0x10 #define TRANSPORT_eSCO 0x20 #define TRANSPORT_ACL 0x30 -#define TRANSPORT_CSB 0x40 +#define TRANSPORT_CPB 0x40 static const value_string payload_transport_rate_payload_vals[] = { @@ -404,7 +404,7 @@ static const value_string packet_type_acl_edr_vals[] = { { 0, NULL } }; -static const value_string packet_type_csb_br_vals[] = { +static const value_string packet_type_cpb_br_vals[] = { { 0x00, "NULL" }, { 0x01, "reserved" }, { 0x02, "reserved" }, @@ -424,7 +424,7 @@ static const value_string packet_type_csb_br_vals[] = { { 0, NULL } }; -static const value_string packet_type_csb_edr_vals[] = { +static const value_string packet_type_cpb_edr_vals[] = { { 0x00, "NULL" }, { 0x01, "reserved" }, { 0x02, "reserved" }, @@ -459,8 +459,8 @@ static const value_string fhs_page_scan_mode_vals[] = { void proto_register_btbredr_rf(void); void proto_reg_handoff_btbredr_rf(void); -static guint8 -reverse_bits(guint8 value) +static uint8_t +reverse_bits(uint8_t value) { value = ((value >> 1) & 0x55) | ((value << 1) & 0xaa); value = ((value >> 2) & 0x33) | ((value << 2) & 0xcc); @@ -468,13 +468,13 @@ reverse_bits(guint8 value) return value; } -static gboolean -broken_check_hec(guint8 uap, guint32 header) +static bool +broken_check_hec(uint8_t uap, uint32_t header) { - guint8 hec; - guint16 header_data; - guint8 lfsr; - gint8 i; + uint8_t hec; + uint16_t header_data; + uint8_t lfsr; + int8_t i; hec = header & 0xFF; header_data = (header >> 8) & 0x3F; @@ -493,28 +493,28 @@ broken_check_hec(guint8 uap, guint32 header) return lfsr == hec; } -static gboolean -check_hec(guint8 uap, guint32 header) +static bool +check_hec(uint8_t uap, uint32_t header) { - static const guint32 crc_poly_rev_bt_hec = 0xe5; + static const uint32_t crc_poly_rev_bt_hec = 0xe5; header &= 0x3ffff; header ^= reverse_bits(uap) & 0xff; - for (guint i = 0; i < 10; ++i, header >>= 1) + for (unsigned i = 0; i < 10; ++i, header >>= 1) if (header & 1) header ^= (crc_poly_rev_bt_hec << 1); return !header; } -static gboolean -check_crc(guint8 uap, tvbuff_t *tvb, gint offset, gint len) +static bool +check_crc(uint8_t uap, tvbuff_t *tvb, int offset, int len) { - static const guint16 crc_poly_rev_bt_pdu = 0x8408; - guint16 crc = reverse_bits(uap); + static const uint16_t crc_poly_rev_bt_pdu = 0x8408; + uint16_t crc = reverse_bits(uap); crc <<= 8; for (; len > 0; --len, ++offset) { - crc ^= tvb_get_guint8(tvb, offset) & 0xff; - for (guint i = 0; i < 8; ++i) { - guint16 x = crc & 1; + crc ^= tvb_get_uint8(tvb, offset) & 0xff; + for (unsigned i = 0; i < 8; ++i) { + uint16_t x = crc & 1; crc >>= 1; crc ^= crc_poly_rev_bt_pdu & -x; } @@ -522,10 +522,10 @@ check_crc(guint8 uap, tvbuff_t *tvb, gint offset, gint len) return !crc; } -static guint32 -extract_lap(const guint8 bd_addr[6]) +static uint32_t +extract_lap(const uint8_t bd_addr[6]) { - guint32 lap = bd_addr[3]; + uint32_t lap = bd_addr[3]; lap <<= 8; lap |= bd_addr[4]; lap <<= 8; @@ -533,14 +533,14 @@ extract_lap(const guint8 bd_addr[6]) return lap; } -static gboolean -is_reserved_lap(guint32 lap) +static bool +is_reserved_lap(uint32_t lap) { return (lap >= 0x9e8b00) && (lap <= 0x9e8b3f); } static connection_info_t * -lookup_connection_info(guint32 interface_id, guint32 adapter_id, guint32 lap, guint32 ltaddr, guint32 pktnum) +lookup_connection_info(uint32_t interface_id, uint32_t adapter_id, uint32_t lap, uint32_t ltaddr, uint32_t pktnum) { connection_info_t *cinfo; wmem_tree_key_t key[6]; @@ -560,23 +560,23 @@ lookup_connection_info(guint32 interface_id, guint32 adapter_id, guint32 lap, gu if (!cinfo) return NULL; if (cinfo->interface_id != interface_id || cinfo->adapter_id != adapter_id || - extract_lap(cinfo->bd_addr[BDADDR_MASTER]) != lap || cinfo->lt_addr != ltaddr) + extract_lap(cinfo->bd_addr[BDADDR_CENTRAL]) != lap || cinfo->lt_addr != ltaddr) return NULL; return cinfo; } connection_info_t * -btbredr_rf_add_esco_link(connection_info_t *cinfo, packet_info *pinfo, guint8 handle, guint32 ltaddr, guint16 pktszms, guint16 pktszsm) +btbredr_rf_add_esco_link(connection_info_t *cinfo, packet_info *pinfo, uint8_t handle, uint32_t ltaddr, uint16_t pktszms, uint16_t pktszsm) { connection_info_t *ecinfo; - guint32 lap; + uint32_t lap; wmem_tree_key_t key[6]; if (!cinfo || !pinfo || ltaddr >= 8 || !ltaddr) return NULL; - lap = extract_lap(cinfo->bd_addr[BDADDR_MASTER]); + lap = extract_lap(cinfo->bd_addr[BDADDR_CENTRAL]); ecinfo = lookup_connection_info(cinfo->interface_id, cinfo->adapter_id, lap, ltaddr, pinfo->num); - if (ecinfo && (memcmp(cinfo->bd_addr[BDADDR_MASTER], ecinfo->bd_addr[BDADDR_MASTER], 6) || - memcmp(cinfo->bd_addr[BDADDR_SLAVE], ecinfo->bd_addr[BDADDR_SLAVE], 6) || + if (ecinfo && (memcmp(cinfo->bd_addr[BDADDR_CENTRAL], ecinfo->bd_addr[BDADDR_CENTRAL], 6) || + memcmp(cinfo->bd_addr[BDADDR_PERIPHERAL], ecinfo->bd_addr[BDADDR_PERIPHERAL], 6) || !ecinfo->esco || ecinfo->escohandle != handle || ecinfo->escosize[0] != pktszms || ecinfo->escosize[1] != pktszsm)) ecinfo = NULL; @@ -588,8 +588,8 @@ btbredr_rf_add_esco_link(connection_info_t *cinfo, packet_info *pinfo, guint8 ha ecinfo->lt_addr = ltaddr; ecinfo->timestamp = cinfo->timestamp; ecinfo->btclock = cinfo->btclock; - memcpy(ecinfo->bd_addr[BDADDR_MASTER], cinfo->bd_addr[BDADDR_MASTER], 6); - memcpy(ecinfo->bd_addr[BDADDR_SLAVE], cinfo->bd_addr[BDADDR_SLAVE], 6); + memcpy(ecinfo->bd_addr[BDADDR_CENTRAL], cinfo->bd_addr[BDADDR_CENTRAL], 6); + memcpy(ecinfo->bd_addr[BDADDR_PERIPHERAL], cinfo->bd_addr[BDADDR_PERIPHERAL], 6); ecinfo->escosize[0] = pktszms; ecinfo->escosize[1] = pktszsm; ecinfo->escohandle = handle; @@ -611,20 +611,20 @@ btbredr_rf_add_esco_link(connection_info_t *cinfo, packet_info *pinfo, guint8 ha } void -btbredr_rf_remove_esco_link(connection_info_t *cinfo, packet_info *pinfo, guint8 handle) +btbredr_rf_remove_esco_link(connection_info_t *cinfo, packet_info *pinfo, uint8_t handle) { connection_info_t *ecinfo; - guint32 lap; + uint32_t lap; wmem_tree_key_t key[6]; if (!cinfo || !pinfo) return; - lap = extract_lap(cinfo->bd_addr[BDADDR_MASTER]); - for (guint32 ltaddr = 1; ltaddr < 8; ++ltaddr) { + lap = extract_lap(cinfo->bd_addr[BDADDR_CENTRAL]); + for (uint32_t ltaddr = 1; ltaddr < 8; ++ltaddr) { ecinfo = lookup_connection_info(cinfo->interface_id, cinfo->adapter_id, lap, ltaddr, pinfo->num); if (!ecinfo) continue; - if (memcmp(cinfo->bd_addr[BDADDR_MASTER], ecinfo->bd_addr[BDADDR_MASTER], 6) || - memcmp(cinfo->bd_addr[BDADDR_SLAVE], ecinfo->bd_addr[BDADDR_SLAVE], 6) || + if (memcmp(cinfo->bd_addr[BDADDR_CENTRAL], ecinfo->bd_addr[BDADDR_CENTRAL], 6) || + memcmp(cinfo->bd_addr[BDADDR_PERIPHERAL], ecinfo->bd_addr[BDADDR_PERIPHERAL], 6) || !ecinfo->esco || ecinfo->escohandle != handle) continue; key[0].length = 1; @@ -643,7 +643,7 @@ btbredr_rf_remove_esco_link(connection_info_t *cinfo, packet_info *pinfo, guint8 } } -static gint +static int dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *btbredr_rf_item; @@ -654,29 +654,29 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da proto_tree *header_tree; proto_item *reserved_item; proto_item *hec_item = NULL; - gint offset = 0; - gint hf_x; - gint header_mode; - guint32 interface_id; - guint32 adapter_id; - guint16 flags; - guint32 lap; - guint8 uap = 0; - guint32 ltaddr; - guint8 payload_and_transport; - gint16 packet_type = PACKET_TYPE_UNKNOWN; - const gchar *packet_type_str = "Unknown"; + int offset = 0; + int hf_x; + int header_mode; + uint32_t interface_id; + uint32_t adapter_id; + uint16_t flags; + uint32_t lap; + uint8_t uap = 0; + uint32_t ltaddr; + uint8_t payload_and_transport; + int16_t packet_type = PACKET_TYPE_UNKNOWN; + const char *packet_type_str = "Unknown"; dissector_table_t packet_type_table = NULL; - gboolean decrypted; - gint isochronous_length = 0; - gboolean isochronous_crc = FALSE; - gboolean isochronous_esco = FALSE; - gint data_length = 0; - gint data_header = 0; - gboolean data_crc = FALSE; - gboolean arqn = FALSE; - gboolean seqn = FALSE; - gint direction = -1; + bool decrypted; + int isochronous_length = 0; + bool isochronous_crc = false; + bool isochronous_esco = false; + int data_length = 0; + int data_header = 0; + bool data_crc = false; + bool arqn = false; + bool seqn = false; + int direction = -1; btbredr_frame_info_t *frame_info = NULL; connection_info_t *connection_info = NULL; device_info_t *device_info = NULL; @@ -700,7 +700,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da col_set_str(pinfo->cinfo, COL_PROTOCOL, "BT BR/EDR RF"); if (tvb_captured_length(tvb) >= 21) { - flags = tvb_get_guint16(tvb, 20, ENC_LITTLE_ENDIAN); + flags = tvb_get_uint16(tvb, 20, ENC_LITTLE_ENDIAN); } else { flags = 0; } @@ -729,13 +729,13 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da proto_tree_add_item(btbredr_rf_tree, hf_access_address_offenses, tvb, offset, 1, ENC_NA); offset += 1; - payload_and_transport = tvb_get_guint8(tvb, offset); + payload_and_transport = tvb_get_uint8(tvb, offset); col_add_fstr(pinfo->cinfo, COL_INFO, "Transport: %s (%s), RF Channel: %s%2u", val_to_str_const(payload_and_transport >> 4, payload_transport_rate_transport_vals, "Unknown"), val_to_str_const(payload_and_transport & 0xF, payload_transport_rate_payload_abbrev_vals, "Unknown"), (flags & FLAGS_RF_CHANNEL_ALIASING) ? "~" : "", - tvb_get_guint8(tvb, 0)); + tvb_get_uint8(tvb, 0)); if (payload_and_transport == 0xFF) proto_tree_add_item(btbredr_rf_tree, hf_payload_transport_rate_ignored, tvb, offset, 1, ENC_NA); @@ -750,7 +750,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da offset += 2; proto_tree_add_item(btbredr_rf_tree, hf_lower_address_part, tvb, offset, 4, ENC_LITTLE_ENDIAN); - lap = tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN) & 0xffffff; + lap = tvb_get_uint32(tvb, offset, ENC_LITTLE_ENDIAN) & 0xffffff; offset += 4; if (!is_reserved_lap(lap)) { @@ -768,7 +768,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da } if (device_info) { - direction = (device_info->dir == pinfo->p2p_dir) ? BDADDR_MASTER : BDADDR_SLAVE; + direction = (device_info->dir == pinfo->p2p_dir) ? BDADDR_CENTRAL : BDADDR_PERIPHERAL; uap = device_info->bd_addr[2]; } @@ -781,7 +781,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da if (flags & FLAGS_REFERENCE_UPPER_ADDRES_PART_VALID) { hf_x = hf_reference_upper_addres_part; - uap = tvb_get_guint8(tvb, offset); + uap = tvb_get_uint8(tvb, offset); } else { hf_x = hf_invalid_reference_upper_addres_part; } @@ -789,11 +789,11 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da offset += 1; { - guint32 hdr = tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN); - gboolean have_uap = device_info || !!(flags & FLAGS_REFERENCE_UPPER_ADDRES_PART_VALID); - gboolean is_inquiry = is_reserved_lap(lap); - gboolean is_inquiry_fhs = is_inquiry && (((hdr >> 3) & 0x0f) == 2); - gboolean is_inquiry_broken_fhs = is_inquiry && (((hdr >> 11) & 0x0f) == 2); + uint32_t hdr = tvb_get_uint32(tvb, offset, ENC_LITTLE_ENDIAN); + bool have_uap = device_info || !!(flags & FLAGS_REFERENCE_UPPER_ADDRES_PART_VALID); + bool is_inquiry = is_reserved_lap(lap); + bool is_inquiry_fhs = is_inquiry && (((hdr >> 3) & 0x0f) == 2); + bool is_inquiry_broken_fhs = is_inquiry && (((hdr >> 11) & 0x0f) == 2); if (is_inquiry && !(is_inquiry_fhs || is_inquiry_broken_fhs)) header_mode = -2; else if (!(flags & FLAGS_PACKET_HEADER_AND_BR_EDR_PAYLOAD_DEWHITENED)) @@ -821,56 +821,56 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da proto_tree_add_item(header_tree, hf_packet_header_reserved, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(header_tree, hf_packet_header_broken_lt_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - ltaddr = (tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 15) & 7; - arqn = (tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 9) & 1; - seqn = (tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 8) & 1; + ltaddr = (tvb_get_uint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 15) & 7; + arqn = (tvb_get_uint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 9) & 1; + seqn = (tvb_get_uint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 8) & 1; if (payload_and_transport == (TRANSPORT_SCO | PAYLOAD_BR)) { proto_tree_add_item(header_tree, hf_packet_header_broken_type_sco_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset + 1) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset + 1) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_sco_br_vals, "Unknown"); packet_type_table = packet_type_sco_br_table; } else if (payload_and_transport == (TRANSPORT_eSCO | PAYLOAD_BR)) { proto_tree_add_item(header_tree, hf_packet_header_broken_type_esco_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset + 1) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset + 1) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_esco_br_vals, "Unknown"); packet_type_table = packet_type_esco_br_table; } else if (payload_and_transport == (TRANSPORT_eSCO | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_eSCO | PAYLOAD_EDR_3)) { proto_tree_add_item(header_tree, hf_packet_header_broken_type_esco_edr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset + 1) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset + 1) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_esco_edr_vals, "Unknown"); packet_type_table = packet_type_esco_edr_table; } else if (payload_and_transport == (TRANSPORT_ACL | PAYLOAD_BR)) { proto_tree_add_item(header_tree, hf_packet_header_broken_type_acl_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset + 1) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset + 1) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_acl_br_vals, "Unknown"); packet_type_table = packet_type_acl_br_table; } else if (payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_3)) { proto_tree_add_item(header_tree, hf_packet_header_broken_type_acl_edr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset + 1) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset + 1) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_acl_edr_vals, "Unknown"); packet_type_table = packet_type_acl_edr_table; - } else if (payload_and_transport == (TRANSPORT_CSB | PAYLOAD_BR)) { - proto_tree_add_item(header_tree, hf_packet_header_broken_type_csb_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); - - packet_type = (tvb_get_guint8(tvb, offset + 1) >> 3) & 0xF; - packet_type_str = val_to_str_const(packet_type, packet_type_csb_br_vals, "Unknown"); - packet_type_table = packet_type_csb_br_table; - } else if (payload_and_transport == (TRANSPORT_CSB | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_3)) { - proto_tree_add_item(header_tree, hf_packet_header_broken_type_csb_edr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - - packet_type = (tvb_get_guint8(tvb, offset + 1) >> 3) & 0xF; - packet_type_str = val_to_str_const(packet_type, packet_type_csb_edr_vals, "Unknown"); - packet_type_table = packet_type_csb_edr_table; + } else if (payload_and_transport == (TRANSPORT_CPB | PAYLOAD_BR)) { + proto_tree_add_item(header_tree, hf_packet_header_broken_type_cpb_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + packet_type = (tvb_get_uint8(tvb, offset + 1) >> 3) & 0xF; + packet_type_str = val_to_str_const(packet_type, packet_type_cpb_br_vals, "Unknown"); + packet_type_table = packet_type_cpb_br_table; + } else if (payload_and_transport == (TRANSPORT_CPB | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_3)) { + proto_tree_add_item(header_tree, hf_packet_header_broken_type_cpb_edr, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + packet_type = (tvb_get_uint8(tvb, offset + 1) >> 3) & 0xF; + packet_type_str = val_to_str_const(packet_type, packet_type_cpb_edr_vals, "Unknown"); + packet_type_table = packet_type_cpb_edr_table; } else if ((payload_and_transport >> 4) == TRANSPORT_ANY) { proto_tree_add_item(header_tree, hf_packet_header_broken_type_any, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset + 1) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset + 1) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_any_vals, "Unknown"); } else { proto_tree_add_item(header_tree, hf_packet_header_broken_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); @@ -886,56 +886,56 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da header_tree = proto_item_add_subtree(header_item, ett_bluetooth_header); proto_tree_add_item(header_tree, hf_packet_header_lt_addr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - ltaddr = tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN) & 7; - arqn = (tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 8) & 1; - seqn = (tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 9) & 1; + ltaddr = tvb_get_uint32(tvb, offset, ENC_LITTLE_ENDIAN) & 7; + arqn = (tvb_get_uint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 8) & 1; + seqn = (tvb_get_uint32(tvb, offset, ENC_LITTLE_ENDIAN) >> 9) & 1; if (payload_and_transport == (TRANSPORT_SCO | PAYLOAD_BR)) { proto_tree_add_item(header_tree, hf_packet_header_type_sco_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_sco_br_vals, "Unknown"); packet_type_table = packet_type_sco_br_table; } else if (payload_and_transport == (TRANSPORT_eSCO | PAYLOAD_BR)) { proto_tree_add_item(header_tree, hf_packet_header_type_esco_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_esco_br_vals, "Unknown"); packet_type_table = packet_type_esco_br_table; } else if (payload_and_transport == (TRANSPORT_eSCO | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_eSCO | PAYLOAD_EDR_3)) { proto_tree_add_item(header_tree, hf_packet_header_type_esco_edr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_esco_edr_vals, "Unknown"); packet_type_table = packet_type_esco_edr_table; } else if (payload_and_transport == (TRANSPORT_ACL | PAYLOAD_BR)) { proto_tree_add_item(header_tree, hf_packet_header_type_acl_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_acl_br_vals, "Unknown"); packet_type_table = packet_type_acl_br_table; } else if (payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_3)) { proto_tree_add_item(header_tree, hf_packet_header_type_acl_edr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_acl_edr_vals, "Unknown"); packet_type_table = packet_type_acl_edr_table; - } else if (payload_and_transport == (TRANSPORT_CSB | PAYLOAD_BR)) { - proto_tree_add_item(header_tree, hf_packet_header_type_csb_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); - - packet_type = (tvb_get_guint8(tvb, offset) >> 3) & 0xF; - packet_type_str = val_to_str_const(packet_type, packet_type_csb_br_vals, "Unknown"); - packet_type_table = packet_type_csb_br_table; - } else if (payload_and_transport == (TRANSPORT_CSB | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_3)) { - proto_tree_add_item(header_tree, hf_packet_header_type_csb_edr, tvb, offset, 4, ENC_LITTLE_ENDIAN); - - packet_type = (tvb_get_guint8(tvb, offset) >> 3) & 0xF; - packet_type_str = val_to_str_const(packet_type, packet_type_csb_edr_vals, "Unknown"); - packet_type_table = packet_type_csb_edr_table; + } else if (payload_and_transport == (TRANSPORT_CPB | PAYLOAD_BR)) { + proto_tree_add_item(header_tree, hf_packet_header_type_cpb_br, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + packet_type = (tvb_get_uint8(tvb, offset) >> 3) & 0xF; + packet_type_str = val_to_str_const(packet_type, packet_type_cpb_br_vals, "Unknown"); + packet_type_table = packet_type_cpb_br_table; + } else if (payload_and_transport == (TRANSPORT_CPB | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_3)) { + proto_tree_add_item(header_tree, hf_packet_header_type_cpb_edr, tvb, offset, 4, ENC_LITTLE_ENDIAN); + + packet_type = (tvb_get_uint8(tvb, offset) >> 3) & 0xF; + packet_type_str = val_to_str_const(packet_type, packet_type_cpb_edr_vals, "Unknown"); + packet_type_table = packet_type_cpb_edr_table; } else if ((payload_and_transport >> 4) == TRANSPORT_ANY) { proto_tree_add_item(header_tree, hf_packet_header_type_any, tvb, offset, 4, ENC_LITTLE_ENDIAN); - packet_type = (tvb_get_guint8(tvb, offset) >> 3) & 0xF; + packet_type = (tvb_get_uint8(tvb, offset) >> 3) & 0xF; packet_type_str = val_to_str_const(packet_type, packet_type_any_vals, "Unknown"); } else { proto_tree_add_item(header_tree, hf_packet_header_type, tvb, offset, 4, ENC_LITTLE_ENDIAN); @@ -996,7 +996,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da flags_item = proto_tree_add_item(btbredr_rf_tree, hf_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN); flags_tree = proto_item_add_subtree(flags_item, ett_flags); - flags = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN); + flags = tvb_get_uint16(tvb, offset, ENC_LITTLE_ENDIAN); reserved_item = proto_tree_add_item(flags_tree, hf_flags_reserved_15_14, tvb, offset, 2, ENC_LITTLE_ENDIAN); if (flags & 0xC000) { @@ -1022,13 +1022,13 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da if ((flags & (FLAGS_SIGNAL_POWER_VALID | FLAGS_NOISE_POWER_VALID)) == (FLAGS_SIGNAL_POWER_VALID | FLAGS_NOISE_POWER_VALID)) { col_append_fstr(pinfo->cinfo, COL_INFO, " (SP: %4i, NP: %4i)", - (gint)tvb_get_gint8(tvb, 1), (gint)tvb_get_gint8(tvb, 2)); + (int)tvb_get_int8(tvb, 1), (int)tvb_get_int8(tvb, 2)); } else if (flags & FLAGS_SIGNAL_POWER_VALID) { col_append_fstr(pinfo->cinfo, COL_INFO, " (SP: %4i)", - (gint)tvb_get_gint8(tvb, 1)); + (int)tvb_get_int8(tvb, 1)); } else if (flags & FLAGS_NOISE_POWER_VALID) { col_append_fstr(pinfo->cinfo, COL_INFO, " (NP: %4i)", - (gint)tvb_get_gint8(tvb, 2)); + (int)tvb_get_int8(tvb, 2)); } if (flags & FLAGS_PACKET_HEADER_AND_BR_EDR_PAYLOAD_DEWHITENED) @@ -1040,59 +1040,59 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da case 0: // NULL case 1: // POLL isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 2: // FHS isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 0; - data_crc = TRUE; - decrypted = TRUE; + data_crc = true; + decrypted = true; break; case 3: // DM1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 1; - data_crc = TRUE; + data_crc = true; break; case 5: // HV1 isochronous_length = 10; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 6: // HV2 isochronous_length = 20; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 7: // HV3 isochronous_length = 30; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 8: // DV isochronous_length = 10; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 10; data_header = 1; - data_crc = TRUE; + data_crc = true; break; default: @@ -1103,37 +1103,37 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da case 0: // NULL case 1: // POLL isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 7: // EV3 isochronous_length = 30; - isochronous_crc = TRUE; - isochronous_esco = TRUE; + isochronous_crc = true; + isochronous_esco = true; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 12: // EV4 isochronous_length = 120; - isochronous_crc = TRUE; - isochronous_esco = TRUE; + isochronous_crc = true; + isochronous_esco = true; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 13: // EV5 isochronous_length = 180; - isochronous_crc = TRUE; - isochronous_esco = TRUE; + isochronous_crc = true; + isochronous_esco = true; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; default: @@ -1144,46 +1144,46 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da case 0: // NULL case 1: // POLL isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 6: // 2-EV3 isochronous_length = 60; - isochronous_crc = TRUE; - isochronous_esco = TRUE; + isochronous_crc = true; + isochronous_esco = true; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 7: // 3-EV3 isochronous_length = 90; - isochronous_crc = TRUE; - isochronous_esco = TRUE; + isochronous_crc = true; + isochronous_esco = true; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 12: // 2-EV5 isochronous_length = 360; - isochronous_crc = TRUE; - isochronous_esco = TRUE; + isochronous_crc = true; + isochronous_esco = true; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 13: // 3-EV5 isochronous_length = 540; - isochronous_crc = TRUE; - isochronous_esco = TRUE; + isochronous_crc = true; + isochronous_esco = true; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; default: @@ -1194,75 +1194,75 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da case 0: // NULL case 1: // POLL isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 2: // FHS isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 0; - data_crc = TRUE; - decrypted = TRUE; + data_crc = true; + decrypted = true; break; case 3: // DM1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 1; - data_crc = TRUE; + data_crc = true; break; case 4: // DH1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 28; data_header = 1; - data_crc = TRUE; + data_crc = true; break; case 9: // AUX1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 30; data_header = 1; - data_crc = FALSE; + data_crc = false; break; case 10: // DM3 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 123; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 11: // DH3 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 185; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 14: // DM5 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 226; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 15: // DH5 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 341; data_header = 2; - data_crc = TRUE; + data_crc = true; break; default: @@ -1273,213 +1273,213 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da case 0: // NULL case 1: // POLL isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 2: // FHS isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 0; - data_crc = TRUE; - decrypted = TRUE; + data_crc = true; + decrypted = true; break; case 3: // DM1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 1; - data_crc = TRUE; + data_crc = true; break; case 4: // 2-DH1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 56; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 8: // 3-DH1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 85; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 9: // AUX1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 30; data_header = 1; - data_crc = FALSE; + data_crc = false; break; case 10: // 2-DH3 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 369; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 11: // 3-DH3 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 554; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 14: // 2-DH5 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 681; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 15: // 3-DH5 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 1023; data_header = 2; - data_crc = TRUE; + data_crc = true; break; default: break; } - } else if (payload_and_transport == (TRANSPORT_CSB | PAYLOAD_BR)) { + } else if (payload_and_transport == (TRANSPORT_CPB | PAYLOAD_BR)) { switch (packet_type) { case 0: // NULL isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 3: // DM1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 1; - data_crc = TRUE; + data_crc = true; break; case 4: // DH1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 28; data_header = 1; - data_crc = TRUE; + data_crc = true; break; case 10: // DM3 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 123; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 11: // DH3 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 185; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 14: // DM5 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 226; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 15: // DH5 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 341; data_header = 2; - data_crc = TRUE; + data_crc = true; break; default: break; } - } else if (payload_and_transport == (TRANSPORT_CSB | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_3)) { + } else if (payload_and_transport == (TRANSPORT_CPB | PAYLOAD_EDR_2) || payload_and_transport == (TRANSPORT_ACL | PAYLOAD_EDR_3)) { switch (packet_type) { case 0: // NULL isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 3: // DM1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 1; - data_crc = TRUE; + data_crc = true; break; case 4: // 2-DH1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 56; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 8: // 3-DH1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 85; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 10: // 2-DH3 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 369; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 11: // 3-DH3 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 554; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 14: // 2-DH5 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 681; data_header = 2; - data_crc = TRUE; + data_crc = true; break; case 15: // 3-DH5 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 1023; data_header = 2; - data_crc = TRUE; + data_crc = true; break; default: @@ -1490,27 +1490,27 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da case 0: // NULL case 1: // POLL isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 0; data_header = 0; - data_crc = FALSE; + data_crc = false; break; case 2: // FHS isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 0; - data_crc = TRUE; - decrypted = TRUE; + data_crc = true; + decrypted = true; break; case 3: // DM1 isochronous_length = 0; - isochronous_crc = FALSE; + isochronous_crc = false; data_length = 18; data_header = 1; - data_crc = TRUE; + data_crc = true; break; default: @@ -1525,12 +1525,12 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da next_tvb = tvb_new_subset_remaining(tvb, offset); if (packet_type_table && packet_type > PACKET_TYPE_UNKNOWN && - dissector_try_uint_new(packet_type_table, packet_type, next_tvb, pinfo, tree, TRUE, bluetooth_data)) { + dissector_try_uint_new(packet_type_table, packet_type, next_tvb, pinfo, tree, true, bluetooth_data)) { offset = tvb_reported_length(tvb); } else { if (isochronous_length > 0 && (!isochronous_crc || (flags & (FLAGS_CRC_PASS | FLAGS_CRC_CHECKED)) == (FLAGS_CRC_PASS | FLAGS_CRC_CHECKED))) { - gint len = tvb_captured_length_remaining(tvb, offset); + int len = tvb_captured_length_remaining(tvb, offset); if (isochronous_crc) len -= 2; if (isochronous_length > len) @@ -1557,42 +1557,42 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da } if (data_length > 0 && (!data_crc || (flags & (FLAGS_CRC_PASS | FLAGS_CRC_CHECKED)) == (FLAGS_CRC_PASS | FLAGS_CRC_CHECKED))) { - gint len = tvb_captured_length_remaining(tvb, offset); - gboolean error = FALSE; - gint llid = -1; + int len = tvb_captured_length_remaining(tvb, offset); + bool error = false; + int llid = -1; if (data_crc) len -= 2; if (data_length > len) data_length = len; if (data_header > 0) { if (len < data_header) { - error = TRUE; + error = true; } else if (data_header == 1) { - guint8 hdr = tvb_get_guint8(tvb, offset); + uint8_t hdr = tvb_get_uint8(tvb, offset); llid = hdr & 3; hdr >>= 3; hdr &= 0x1f; ++hdr; if (hdr > len) - error = TRUE; + error = true; else data_length = hdr; } else if (data_header == 2) { - guint16 hdr = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN); + uint16_t hdr = tvb_get_uint16(tvb, offset, ENC_LITTLE_ENDIAN); llid = hdr & 3; hdr >>= 3; hdr &= 0x3ff; hdr += 2; if (hdr > len) - error = TRUE; + error = true; else data_length = hdr; } else { - error = TRUE; + error = true; } } if (data_length > 0 && !error) { - gboolean handled = FALSE; + bool handled = false; fragment_head *frag_l2cap_msg = NULL; if (data_header == 1) { proto_item *pheader_item = proto_tree_add_item(btbredr_rf_tree, hf_payload_header1, tvb, offset, 1, ENC_LITTLE_ENDIAN); @@ -1629,7 +1629,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da fhs_data->device_info = device_info; fhs_data->connection_info = connection_info; call_dissector_with_data(btbredr_fhs_handle, next_tvb, pinfo, tree, fhs_data); - handled = TRUE; + handled = true; } } switch (llid) { @@ -1640,15 +1640,15 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da if (!next_tvb) break; call_dissector_with_data(btlmp_handle, next_tvb, pinfo, tree, connection_info); - handled = TRUE; + handled = true; break; case 0x02: // Start of or complete L2CAP message if (!btl2cap_handle) break; if (frame_info && data_length > data_header) { - guint pdu_len = data_length - data_header; - guint l2cap_len = tvb_get_letohs(tvb, offset + data_header); + unsigned pdu_len = data_length - data_header; + unsigned l2cap_len = tvb_get_letohs(tvb, offset + data_header); if (l2cap_len + 4 <= pdu_len) { bthci_acl_data_t *acl_data = wmem_new(pinfo->pool, bthci_acl_data_t); acl_data->interface_id = interface_id; @@ -1656,13 +1656,13 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da acl_data->chandle = 0; /* No connection handle at this layer */ acl_data->remote_bd_addr_oui = 0; acl_data->remote_bd_addr_id = 0; - acl_data->is_btle = TRUE; - acl_data->is_btle_retransmit = FALSE; + acl_data->is_btle = true; + acl_data->is_btle_retransmit = false; 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; + handled = true; col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Data"); if (!pinfo->fd->visited && connection_info && direction >= 0) { connection_info->reassembly[direction].l2cap_index = pinfo->num; @@ -1670,7 +1670,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da } break; } - pinfo->fragmented = TRUE; + pinfo->fragmented = true; if (!frame_info->retransmit && connection_info && direction >= 0) { if (!pinfo->fd->visited) { connection_info->reassembly[direction].l2cap_index = pinfo->num; @@ -1680,7 +1680,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da frag_l2cap_msg = fragment_add_seq_next(&l2cap_msg_reassembly_table, tvb, offset + data_header, pinfo, - frame_info->l2cap_index, /* guint32 ID for fragments belonging together */ + frame_info->l2cap_index, /* uint32_t ID for fragments belonging together */ NULL, /* data* */ pdu_len, /* Fragment length */ frame_info->more_fragments); /* More fragments */ @@ -1692,7 +1692,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da btbredr_rf_tree); } proto_tree_add_item(btbredr_rf_tree, hf_l2cap_fragment, tvb, offset + data_header, pdu_len, ENC_NA); - handled = TRUE; + handled = true; col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Fragment Start"); } break; @@ -1704,9 +1704,9 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da col_set_str(pinfo->cinfo, COL_INFO, "Empty PDU"); break; } - pinfo->fragmented = TRUE; + pinfo->fragmented = true; if (!frame_info->retransmit && connection_info && direction >= 0) { - guint pdu_len = data_length - data_header; + unsigned pdu_len = data_length - data_header; if (!pinfo->fd->visited) { if (connection_info->reassembly[direction].segment_len_rem > 0) { if (connection_info->reassembly[direction].segment_len_rem >= pdu_len) { @@ -1737,7 +1737,7 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da frag_l2cap_msg = fragment_add_seq_next(&l2cap_msg_reassembly_table, tvb, offset + data_header, pinfo, - frame_info->l2cap_index, /* guint32 ID for fragments belonging together */ + frame_info->l2cap_index, /* uint32_t ID for fragments belonging together */ NULL, /* data* */ pdu_len, /* Fragment length */ frame_info->more_fragments); /* More fragments */ @@ -1755,18 +1755,18 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da acl_data->chandle = 0; /* No connection handle at this layer */ acl_data->remote_bd_addr_oui = 0; acl_data->remote_bd_addr_id = 0; - acl_data->is_btle = TRUE; - acl_data->is_btle_retransmit = FALSE; + acl_data->is_btle = true; + acl_data->is_btle_retransmit = false; 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; + handled = true; col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Data"); } else { proto_item *item = proto_tree_add_item(btbredr_rf_tree, hf_l2cap_fragment, tvb, offset + data_header, data_length - data_header, ENC_NA); if (frame_info->missing_start) expert_add_info(pinfo, item, &ei_missing_fragment_start); - handled = TRUE; + handled = true; col_set_str(pinfo->cinfo, COL_INFO, "L2CAP Fragment"); } break; @@ -1818,20 +1818,20 @@ dissect_btbredr_rf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da return offset; } -static gint +static int dissect_btbredr_fhs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { proto_item *btbredr_fhs_item; proto_tree *btbredr_fhs_tree; - gint offset = 0; - guint32 interface_id; - guint32 adapter_id; - guint64 parity_lap_eir_sp_sr; - guint32 lap; - guint8 uap; - guint16 nap; - guint32 ltaddr_clk_pgscan; - guint32 ltaddr; + int offset = 0; + uint32_t interface_id; + uint32_t adapter_id; + uint64_t parity_lap_eir_sp_sr; + uint32_t lap; + uint8_t uap; + uint16_t nap; + uint32_t ltaddr_clk_pgscan; + uint32_t ltaddr; device_info_t *device_info = NULL; connection_info_t *connection_info = NULL; btbredr_fhs_data_t *fhs_data = (btbredr_fhs_data_t *) data; @@ -1859,21 +1859,21 @@ dissect_btbredr_fhs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d proto_tree_add_item(btbredr_fhs_tree, hf_fhs_reserved, tvb, offset, 8, ENC_LITTLE_ENDIAN); proto_tree_add_item(btbredr_fhs_tree, hf_fhs_sr, tvb, offset, 8, ENC_LITTLE_ENDIAN); proto_tree_add_item(btbredr_fhs_tree, hf_fhs_sp, tvb, offset, 8, ENC_LITTLE_ENDIAN); - parity_lap_eir_sp_sr = tvb_get_guint64(tvb, offset, ENC_LITTLE_ENDIAN); + parity_lap_eir_sp_sr = tvb_get_uint64(tvb, offset, ENC_LITTLE_ENDIAN); lap = (parity_lap_eir_sp_sr >> 34) & 0xffffff; offset += 8; proto_tree_add_item(btbredr_fhs_tree, hf_fhs_uap, tvb, offset, 1, ENC_LITTLE_ENDIAN); - uap = tvb_get_guint8(tvb, offset); + uap = tvb_get_uint8(tvb, offset); offset += 1; proto_tree_add_item(btbredr_fhs_tree, hf_fhs_nap, tvb, offset, 2, ENC_LITTLE_ENDIAN); - nap = tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN); + nap = tvb_get_uint16(tvb, offset, ENC_LITTLE_ENDIAN); offset += 2; proto_tree_add_item(btbredr_fhs_tree, hf_fhs_class, tvb, offset, 3, ENC_LITTLE_ENDIAN); offset += 3; proto_tree_add_item(btbredr_fhs_tree, hf_fhs_ltaddr, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(btbredr_fhs_tree, hf_fhs_clk, tvb, offset, 4, ENC_LITTLE_ENDIAN); proto_tree_add_item(btbredr_fhs_tree, hf_fhs_pagescanmode, tvb, offset, 4, ENC_LITTLE_ENDIAN); - ltaddr_clk_pgscan = tvb_get_guint32(tvb, offset, ENC_LITTLE_ENDIAN); + ltaddr_clk_pgscan = tvb_get_uint32(tvb, offset, ENC_LITTLE_ENDIAN); offset += 4; ltaddr = ltaddr_clk_pgscan & 0x00000007; @@ -1907,8 +1907,8 @@ dissect_btbredr_fhs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d connection_info = lookup_connection_info(interface_id, adapter_id, lap, ltaddr, pinfo->num); if (!pinfo->fd->visited) { if (connection_info && fhs_data->device_info && - !memcmp(connection_info->bd_addr[BDADDR_SLAVE], null_bd_addr, 6)) - memcpy(connection_info->bd_addr[BDADDR_SLAVE], fhs_data->device_info->bd_addr, 6); + !memcmp(connection_info->bd_addr[BDADDR_PERIPHERAL], null_bd_addr, 6)) + memcpy(connection_info->bd_addr[BDADDR_PERIPHERAL], fhs_data->device_info->bd_addr, 6); if (!connection_info && device_info) { wmem_tree_key_t key[6]; key[0].length = 1; @@ -1929,9 +1929,9 @@ dissect_btbredr_fhs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d connection_info->lt_addr = ltaddr; connection_info->timestamp = pinfo->abs_ts; connection_info->btclock = (ltaddr_clk_pgscan >> 3) & 0x3ffffff; - memcpy(connection_info->bd_addr[BDADDR_MASTER], device_info->bd_addr, 6); + memcpy(connection_info->bd_addr[BDADDR_CENTRAL], device_info->bd_addr, 6); if (fhs_data->device_info) - memcpy(connection_info->bd_addr[BDADDR_SLAVE], fhs_data->device_info->bd_addr, 6); + memcpy(connection_info->bd_addr[BDADDR_PERIPHERAL], fhs_data->device_info->bd_addr, 6); wmem_tree_insert32_array(connection_info_tree, key, connection_info); } } @@ -2036,12 +2036,12 @@ proto_register_btbredr_rf(void) NULL, HFILL } }, { &hf_reference_upper_addres_part, - { "Reference Upper Address Part", "btbredr_rf.reference_upper_addres_part", + { "Reference Upper Address Part", "btbredr_rf.reference_upper_address_part", FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL } }, { &hf_invalid_reference_upper_addres_part, - { "Invalid Reference Upper Address Part", "btbredr_rf.invalid.reference_upper_addres_part", + { "Invalid Reference Upper Address Part", "btbredr_rf.invalid.reference_upper_address_part", FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL } }, @@ -2100,14 +2100,14 @@ proto_register_btbredr_rf(void) FT_UINT32, BASE_HEX, VALS(packet_type_acl_edr_vals), 0x00000078, NULL, HFILL } }, - { &hf_packet_header_type_csb_br, + { &hf_packet_header_type_cpb_br, { "Type", "btbredr_rf.packet_header.type", - FT_UINT32, BASE_HEX, VALS(packet_type_csb_br_vals), 0x00000078, + FT_UINT32, BASE_HEX, VALS(packet_type_cpb_br_vals), 0x00000078, NULL, HFILL } }, - { &hf_packet_header_type_csb_edr, + { &hf_packet_header_type_cpb_edr, { "Type", "btbredr_rf.packet_header.type", - FT_UINT32, BASE_HEX, VALS(packet_type_csb_edr_vals), 0x00000078, + FT_UINT32, BASE_HEX, VALS(packet_type_cpb_edr_vals), 0x00000078, NULL, HFILL } }, { &hf_packet_header_flow_control, @@ -2175,14 +2175,14 @@ proto_register_btbredr_rf(void) FT_UINT32, BASE_HEX, VALS(packet_type_acl_edr_vals), 0x00007800, NULL, HFILL } }, - { &hf_packet_header_broken_type_csb_br, + { &hf_packet_header_broken_type_cpb_br, { "Type", "btbredr_rf.packet_header.type", - FT_UINT32, BASE_HEX, VALS(packet_type_csb_br_vals), 0x00007800, + FT_UINT32, BASE_HEX, VALS(packet_type_cpb_br_vals), 0x00007800, NULL, HFILL } }, - { &hf_packet_header_broken_type_csb_edr, + { &hf_packet_header_broken_type_cpb_edr, { "Type", "btbredr_rf.packet_header.type", - FT_UINT32, BASE_HEX, VALS(packet_type_csb_edr_vals), 0x00007800, + FT_UINT32, BASE_HEX, VALS(packet_type_cpb_edr_vals), 0x00007800, NULL, HFILL } }, { &hf_packet_header_broken_flow_control, @@ -2281,7 +2281,7 @@ proto_register_btbredr_rf(void) NULL, HFILL } }, { &hf_flags_reference_upper_addres_part_valid, - { "Reference Upper Address Part Valid", "btbredr_rf.flags.reference_upper_addres_part_valid", + { "Reference Upper Address Part Valid", "btbredr_rf.flags.reference_upper_address_part_valid", FT_BOOLEAN, 16, NULL, 0x0080, NULL, HFILL } }, @@ -2480,7 +2480,7 @@ proto_register_btbredr_rf(void) } }; - static gint *ett[] = { + static int *ett[] = { &ett_btbredr_rf, &ett_flags, &ett_payload_transport_rate, @@ -2521,8 +2521,8 @@ proto_register_btbredr_rf(void) packet_type_esco_edr_table = register_dissector_table("btbredr_rf.packet_type.esco.edr", "BT Packet Type for eSCO EDR", proto_btbredr_rf, FT_UINT8, BASE_HEX); packet_type_acl_br_table = register_dissector_table("btbredr_rf.packet_type.acl.br", "BT Packet Type for ACL BR", proto_btbredr_rf, FT_UINT8, BASE_HEX); packet_type_acl_edr_table = register_dissector_table("btbredr_rf.packet_type.acl.edr", "BT Packet Type for ACL EDR", proto_btbredr_rf, FT_UINT8, BASE_HEX); - packet_type_csb_br_table = register_dissector_table("btbredr_rf.packet_type.csb.br", "BT Packet Type for CSB BR", proto_btbredr_rf, FT_UINT8, BASE_HEX); - packet_type_csb_edr_table = register_dissector_table("btbredr_rf.packet_type.csb.edr", "BT Packet Type for CSB EDR", proto_btbredr_rf, FT_UINT8, BASE_HEX); + packet_type_cpb_br_table = register_dissector_table("btbredr_rf.packet_type.cpb.br", "BT Packet Type for CPB BR", proto_btbredr_rf, FT_UINT8, BASE_HEX); + packet_type_cpb_edr_table = register_dissector_table("btbredr_rf.packet_type.cpb.edr", "BT Packet Type for CPB EDR", proto_btbredr_rf, FT_UINT8, BASE_HEX); expert_module = expert_register_protocol(proto_btbredr_rf); expert_register_field_array(expert_module, ei, array_length(ei)); |