Wireshark-commits: [Wireshark-commits] master 7e7db3e: sll: add support for LINKTYPE_LINUX_SLL2.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7e7db3e91ce50f1f3ba35f88aff83c66b5f9bf97
Submitter: "Guy Harris <gharris@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
7e7db3e by Guy Harris (guy@xxxxxxxxxxxx):
sll: add support for LINKTYPE_LINUX_SLL2.
Different header, with a different size, an additional field, and with
fields being in a different order.
Distinguish between V1 and V2 by giving the version.
That means we can no longer use the "ethertype" dissector as it stands,
because the packet type field isn't at the end of the header, right
before the payload; pull the "add the type field to the protocol tree"
functionality out of the "ethertype" dissector and leave it up to the
dissector calling it.
Change-Id: I72b8a2483c0a539919fbe5d35fd7e60bff4bf75a
Reviewed-on: https://code.wireshark.org/review/37169
Petri-Dish: Guy Harris <gharris@xxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@xxxxxxxxx>
Actions performed:
from 2480d9b Add an encapsulation table entry for WTAP_ENCAP_MP4.
add 7e7db3e sll: add support for LINKTYPE_LINUX_SLL2.
Summary of changes:
epan/dissectors/packet-avsp.c | 4 +-
epan/dissectors/packet-btbnep.c | 6 +-
epan/dissectors/packet-cisco-metadata.c | 5 +-
epan/dissectors/packet-cisco-ttag.c | 4 +-
epan/dissectors/packet-etag.c | 4 +-
epan/dissectors/packet-eth.c | 5 +-
epan/dissectors/packet-ethertype.c | 12 +-
epan/dissectors/packet-fw1.c | 5 +-
epan/dissectors/packet-gmhdr.c | 6 +-
epan/dissectors/packet-homepna.c | 4 +-
epan/dissectors/packet-ieee8021ah.c | 17 +-
epan/dissectors/packet-pa-hbbackup.c | 7 +-
epan/dissectors/packet-sll.c | 331 ++++++++++++++++++++++++--------
epan/dissectors/packet-tte.c | 3 +-
epan/dissectors/packet-vlan.c | 5 +-
epan/dissectors/packet-vmlab.c | 4 +-
epan/dissectors/packet-vntag.c | 6 +-
epan/packet.h | 3 +-
test/suite_text2pcap.py | 2 +-
wiretap/pcap-common.c | 5 +-
wiretap/wtap.c | 5 +-
wiretap/wtap.h | 1 +
22 files changed, 314 insertions(+), 130 deletions(-)
