osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add Apple Wireless Direct Link (AWDL) dissector 

More information on Apple's proprietary AWDL protocol can be found in
  Milan Stute, David Kreitschmann, and Matthias Hollick. "One Billion Apples'
  Secret Sauce: Recipe for the Apple Wireless Direct Link Ad hoc Protocol"
  in ACM MobiCom '18. https://doi.org/10.1145/3241539.3241566

Bug: 15245
Change-Id: I5ce18125b3c957f338909e46f18e30405a3d3941
Reviewed-on: https://code.wireshark.org/review/30413
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Milan Stute 2018-10-25 12:59:54 +02:00 committed by Anders Broman
parent bd3cb6437f
commit 6f2ca96359
5 changed files with 2675 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docbook/release-notes.asciidoc
View File

@ -82,6 +82,7 @@ since version 2.6.0:
--
BLIP protocol for Couchbase Lite
CDMA 2000
Apple Wireless Direct Link (AWDL) protocol
Cisco Meraki Discovery Protocol (MDP)
DoIP (ISO 13400-2 Diagnostic communication over Internet Protocol)
DXL protocol

1
epan/dissectors/CMakeLists.txt
View File

@ -690,6 +690,7 @@ set(DISSECTOR_SRC
${CMAKE_CURRENT_SOURCE_DIR}/packet-atmtcp.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-auto_rp.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-avsp.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-awdl.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-ax25.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-ax25-kiss.c
${CMAKE_CURRENT_SOURCE_DIR}/packet-ax25-nol3.c

2671
epan/dissectors/packet-awdl.c Executable file
View File

File diff suppressed because it is too large Load Diff

1
epan/oui.h
View File

@ -49,6 +49,7 @@
#define OUI_ERICSSON_MOBILE 0x0015E0 /* Ericsson Mobile Platforms */
#define OUI_SONY_ERICSSON_5 0x001620 /* Sony Ericsson Mobile Communications AB */
#define OUI_SONY_ERICSSON_6 0x0016B8 /* Sony Ericsson Mobile Communications AB */
#define OUI_APPLE_AWDL 0x0017F2 /* Apple AWDL */
#define OUI_SONY_ERICSSON_7 0x001813 /* Sony Ericsson Mobile Communications AB */
#define OUI_BLUETOOTH 0x001958 /* Bluetooth SIG */
#define OUI_SONY_ERICSSON_8 0x001963 /* Sony Ericsson Mobile Communications AB */

1
tools/checkfiltername.pl
View File

@ -380,6 +380,7 @@ sub is_from_other_protocol_whitelist {
}
# XXX - may be faster to hash this (note 1-many relationship)?
if (($proto_filename eq "packet-awdl.c") && (index($_[0], "llc") >= 0)) {return 1;}
if (($proto_filename eq "packet-bpdu.c") && (index($_[0], "mstp") >= 0)) {return 1;}
if (($proto_filename eq "packet-bssap.c") && (index($_[0], "bsap") >= 0)) {return 1;}
if (($proto_filename eq "packet-caneth.c") && (index($_[0], "can") >= 0)) {return 1;}