summaryrefslogtreecommitdiff
path: root/wiretap/wtap.c
diff options
context:
space:
mode:
authorChristopher Kilgour <techie@whiterocker.com>2014-02-21 23:39:45 -0800
committerAnders Broman <a.broman58@gmail.com>2014-03-07 05:20:17 +0000
commitef94a80bfa86362cfca09e1982010b5a9a47d247 (patch)
tree22d58c86826d253b90b2dbd7f1773cabbc4f77bb /wiretap/wtap.c
parent825ce03222ef7a4e6e7b2c215cae0597eeb55e96 (diff)
downloadwireshark-ef94a80bfa86362cfca09e1982010b5a9a47d247.tar.gz
Introduces two new Bluetooth DLTs for RF-based captures.
Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/wtap.c')
-rw-r--r--wiretap/wtap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index ce9ff40591..07e5004bd1 100644
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -697,6 +697,11 @@ static struct encap_type_info encap_table_base[] = {
/* WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR */
{ "Bluetooth Linux Monitor", "bluetooth-linux-monitor" },
+ /* WTAP_ENCAP_BLUETOOTH_BREDR_BB */
+ { "Bluetooth BR/EDR Baseband RF", "bluetooth-bredr-bb-rf" },
+
+ /* WTAP_ENCAP_BLUETOOTH_LE_LL_WITH_PHDR */
+ { "Bluetooth Low Energy Link Layer RF", "bluetooth-le-ll-rf" },
};
WS_DLL_LOCAL