diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-01-12 00:50:41 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-01-12 00:50:41 +0000 |
| commit | c071a1c7286eb9789dc5c96bb45ab75c75c3ecb4 (patch) | |
| tree | 39717e01eed5f1ad45d3276c820938e3c0ee7d4d /wiretap/wtap.c | |
| parent | 4210311b6985f957ad4073b410678685f0494865 (diff) | |
| download | wireshark-c071a1c7286eb9789dc5c96bb45ab75c75c3ecb4.tar.gz | |
Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606)
From Michal Labedski
1. add support for new btsnoop "format" introduced by BlueZ team in "btmon" tool
2. Bluetooth: Make EIR, AD and COD more generic
3. Bluetooth: HCI/LL: Update Error Codes to Core 4.1 Specification
4. Ubertooth: Fix response command handling
5. Ubertooth: Update to support firmware version
6. Ubertooth: Dissect by Vendor Id/Product Id
svn path=/trunk/; revision=54699
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 64fbcf8d69..d5b4c89e6d 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -695,6 +695,10 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_NETLINK */ { "Netlink", "Linux netlink" }, + + /* WTAP_ENCAP_BLUETOOTH_LINUX_MONITOR */ + { "Bluetooth Linux Monitor", "bluetooth-linux-monitor" }, + }; WS_DLL_LOCAL |