diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-23 18:54:09 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-23 18:54:09 +0000 |
| commit | 1b5ebb16fd4c7125198065a0e6f200d47610a55e (patch) | |
| tree | b7d73f8f6af107d821653517a99d7ce08eab5ee2 | |
| parent | 21eb60df17ed7c7ca0ab162ac3599f6d03b4ad19 (diff) | |
| download | wireshark-1b5ebb16fd4c7125198065a0e6f200d47610a55e.tar.gz | |
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122
Bluetooth: HCI_USB seems to be compatible with AMP Controllers
svn path=/trunk/; revision=54399
| -rw-r--r-- | epan/dissectors/packet-hci_usb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index 37be9330e6..b318f06af6 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -63,6 +63,7 @@ static wmem_tree_t *fragment_info_table = NULL; static reassembly_table hci_usb_reassembly_table; +static dissector_handle_t hci_usb_handle; static dissector_handle_t bthci_cmd_handle; static dissector_handle_t bthci_evt_handle; static dissector_handle_t bthci_acl_handle; @@ -338,7 +339,7 @@ proto_register_hci_usb(void) proto_hci_usb = proto_register_protocol("Bluetooth HCI USB Transport", "HCI_USB", "hci_usb"); proto_register_field_array(proto_hci_usb, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - new_register_dissector("hci_usb", dissect_hci_usb, proto_hci_usb); + hci_usb_handle = new_register_dissector("hci_usb", dissect_hci_usb, proto_hci_usb); module = prefs_register_protocol(proto_hci_usb, NULL); prefs_register_static_text_preference(module, "bthci_usb.version", @@ -349,9 +350,6 @@ proto_register_hci_usb(void) void proto_reg_handoff_hci_usb(void) { - dissector_handle_t hci_usb_handle; - - hci_usb_handle = find_dissector("hci_usb"); bthci_cmd_handle = find_dissector("bthci_cmd"); bthci_evt_handle = find_dissector("bthci_evt"); bthci_acl_handle = find_dissector("bthci_acl"); @@ -366,6 +364,7 @@ proto_reg_handoff_hci_usb(void) dissector_add_uint("usb.product", (0x13d3 << 16) | 0x3375, hci_usb_handle); dissector_add_uint("usb.protocol", 0xE00101, hci_usb_handle); + dissector_add_uint("usb.protocol", 0xE00104, hci_usb_handle); dissector_add_handle("usb.device", hci_usb_handle); } |