Wireshark-commits: [Wireshark-commits] master 2e3dcd4: Fix dissection of gatewayed/bridged LLAP pac
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2e3dcd479ebfea160b979882423f4fd04150aec7
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
2e3dcd4 by Guy Harris (guy@xxxxxxxxxxxx):
Fix dissection of gatewayed/bridged LLAP packets.
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@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 9f8ac4d IEEE 802.15.4: Separate ACK tracking and conversations
add 2e3dcd4 Fix dissection of gatewayed/bridged LLAP packets.
Summary of changes:
epan/dissectors/packet-atalk.c | 36 +++++++++++++++++++++++++++++++++++-
epan/dissectors/packet-awdl.c | 16 ++++++++--------
epan/dissectors/packet-ethertype.c | 2 +-
epan/dissectors/packet-llc.c | 16 ----------------
tools/checkfiltername.pl | 1 +
5 files changed, 45 insertions(+), 26 deletions(-)
