diff options
| author | Christopher Kilgour <techie@whiterocker.com> | 2014-02-21 23:39:45 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-03-07 05:20:17 +0000 |
| commit | ef94a80bfa86362cfca09e1982010b5a9a47d247 (patch) | |
| tree | 22d58c86826d253b90b2dbd7f1773cabbc4f77bb /wiretap | |
| parent | 825ce03222ef7a4e6e7b2c215cae0597eeb55e96 (diff) | |
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')
| -rw-r--r-- | wiretap/pcap-common.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 393deb38f8..2fbdc61440 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -419,6 +419,11 @@ static const struct { { 253, WTAP_ENCAP_NETLINK }, /* Bluetooth Linux Monitor */ { 254, WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR }, + /* Bluetooth BR/EDR Baseband RF captures */ + { 255, WTAP_ENCAP_BLUETOOTH_BREDR_BB }, + /* Bluetooth Low Energy Link Layer RF captures */ + { 256, WTAP_ENCAP_BLUETOOTH_LE_LL_WITH_PHDR }, + /* * To repeat: * 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 diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 61cb2bff5f..1f18b1298e 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -251,6 +251,8 @@ extern "C" { #define WTAP_ENCAP_STANAG_5066_D_PDU 158 #define WTAP_ENCAP_NETLINK 159 #define WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR 160 +#define WTAP_ENCAP_BLUETOOTH_BREDR_BB 161 +#define WTAP_ENCAP_BLUETOOTH_LE_LL_WITH_PHDR 162 /* After adding new item here, please also add new item to encap_table_base array */ #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |