diff options
| author | Michal Labedzki <michal.labedzki@tieto.com> | 2016-11-23 13:26:17 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-04 01:02:38 +0000 |
| commit | 59bbe6b0cd4f33341c5c0a517474debf579b6804 (patch) | |
| tree | c7375d9f89d99b3350d26464951b12091e0aa4e0 /epan/dissectors/packet-bthci_evt.c | |
| parent | cf1d07c8e371c48e73a27941e0e645230a0944d1 (diff) | |
Bluetooth: HCI: A few minor improvements
1. According to ESR05 there is no event called "Bluetooth Logo Testing".
2. According to ESR09 error code 0x23 is also "LL Procedure Collision"
3. Add some HCI status for event for HCI Summary
bthci_evt is now up-to-date with Bluetooth Core 4 + CSA4 + CSS6 and ERS09
- nothing to implementing...
Change-Id: Ief9e2de61be91942ab2211de6bc44a8f15d12426
Reviewed-on: https://code.wireshark.org/review/20355
Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-bthci_evt.c')
| -rw-r--r-- | epan/dissectors/packet-bthci_evt.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 805ea124c2..e165a5e8a9 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -604,7 +604,7 @@ static const value_string evt_code_vals[] = { /* Core 4*/ {0x57, "Authenticated Payload Timeout Expired"}, /* Other */ - {0xfe, "Bluetooth Logo Testing"}, + /*{0xfe, "Bluetooth Logo Testing"}, // According to ESR05 it is not assigned */ {0xff, "Vendor-Specific"}, {0, NULL} }; @@ -5422,11 +5422,13 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; case 0x4f: /* Synchronization Train Complete */ proto_tree_add_item(tree, hf_bthci_evt_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); + send_hci_summary_status_tap(tvb_get_guint8(tvb, offset), pinfo, bluetooth_data); offset += 1; break; case 0x50: /* Synchronization Train Received */ proto_tree_add_item(tree, hf_bthci_evt_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); + send_hci_summary_status_tap(tvb_get_guint8(tvb, offset), pinfo, bluetooth_data); offset += 1; offset = dissect_bd_addr(hf_bthci_evt_bd_addr, pinfo, tree, tvb, offset, FALSE, bluetooth_data->interface_id, bluetooth_data->adapter_id, NULL); @@ -5489,6 +5491,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; case 0x53: /* Truncated Page Complete */ proto_tree_add_item(tree, hf_bthci_evt_status, tvb, offset, 1, ENC_LITTLE_ENDIAN); + send_hci_summary_status_tap(tvb_get_guint8(tvb, offset), pinfo, bluetooth_data); offset += 1; offset = dissect_bd_addr(hf_bthci_evt_bd_addr, pinfo, tree, tvb, offset, FALSE, bluetooth_data->interface_id, bluetooth_data->adapter_id, NULL); @@ -5515,12 +5518,6 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat offset += 2; break; - case 0xfe: /* Bluetooth Logo Testing */ -/* TODO: Implement above cases */ - proto_tree_add_expert(bthci_evt_tree, pinfo, &ei_event_undecoded, tvb, offset, tvb_captured_length_remaining(tvb, offset)); - offset += tvb_reported_length_remaining(tvb, offset); - - break; case 0xff: /* Vendor-Specific */ if (!dissector_try_uint_new(vendor_dissector_table, HCI_VENDOR_DEFAULT, tvb, pinfo, tree, TRUE, bluetooth_data)) { if (bluetooth_data) { |