diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-05-08 18:41:26 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-05-09 04:27:52 +0000 |
| commit | 2e3dcd479ebfea160b979882423f4fd04150aec7 (patch) | |
| tree | 01a35ce90cc8147806f3dba7f514bbd5fdcf0ad0 /epan/dissectors/packet-ethertype.c | |
| parent | 9f8ac4d422ba8262ef52b203f08aa779e54fb9ca (diff) | |
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@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ethertype.c')
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 66596f2e36..88539e0dd3 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -45,7 +45,7 @@ const value_string etype_vals[] = { { ETHERTYPE_EPL_V1, "EPL_V1" }, { ETHERTYPE_REVARP, "RARP" }, { ETHERTYPE_DEC_LB, "DEC LanBridge" }, - { ETHERTYPE_ATALK, "Appletalk" }, + { ETHERTYPE_ATALK, "AppleTalk LLAP bridging" }, { ETHERTYPE_SNA, "SNA-over-Ethernet" }, { ETHERTYPE_DLR, "EtherNet/IP Device Level Ring" }, { ETHERTYPE_AARP, "AARP" }, |