aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-awdl.c
AgeCommit message (Collapse)AuthorFilesLines
2019-05-09Fix dissection of gatewayed/bridged LLAP packets.Guy Harris1-8/+8
EtherTalk and TokenTalk frames use LLC/SNAP headers with an OUI of 08:00:07 and a PID of 0x809B. Frames with an Ethertype of 0x809B - either as the Ethertype field of an Ethernet frame or as the PID, in combination of an OUI of 00:00:00, of an LLC/SNAP frame - have an LLAP frame, complete with an LLAP header, as the payload. Don't treat 08:00:07 as a special case - register it as an OUI and give it a dissector table, and register the DDP dissector in that dissector table with ETHERTYPE_ATALK. Register the LLAP dissector in the "ethertype" table with the Ethertype ETHERTYPE_ATALK. This means we now have two separate LLC+SNAP PID tables for Apple; name them appropriately. That also means we need to add packet-atalk.c to the list of files allowed to add "llc." named fields. Change-Id: I00bafd692f83f73bd347628cb9e950863c26a2b7 Reviewed-on: https://code.wireshark.org/review/33125 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-04-24dissectors: remove execute bits from awdl, gbcs, pcomtcpPeter Wu1-0/+0
Change-Id: I82fb3dabc999a43561be0e438e4ded73d198bfa9 Reviewed-on: https://code.wireshark.org/review/32970 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-04-04epan: Convert our PROTO_ITEM_ macros to inline functions.Gerald Combs1-1/+1
Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-29Add Apple Wireless Direct Link (AWDL) dissectorMilan Stute1-0/+2671
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>