diff options
| author | Guy Harris <guy@alum.mit.edu> | 2020-05-08 18:20:03 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-05-09 03:14:50 +0000 |
| commit | 7e7db3e91ce50f1f3ba35f88aff83c66b5f9bf97 (patch) | |
| tree | ddeaf077db64366f56d97c3579ee8ed451a7e3c1 /wiretap/wtap.c | |
| parent | 2480d9b69a9f416a6a3836def1479c66fec8d7b9 (diff) | |
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@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 93a87cc122..5e8959ff08 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -438,7 +438,7 @@ static struct encap_type_info encap_table_base[] = { { "ieee-802-11-avs", "IEEE 802.11 plus AVS radio header" }, /* WTAP_ENCAP_SLL */ - { "linux-sll", "Linux cooked-mode capture" }, + { "linux-sll", "Linux cooked-mode capture v1" }, /* WTAP_ENCAP_FRELAY */ { "frelay", "Frame Relay" }, @@ -991,6 +991,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_MP4 */ { "mp4", "MP4 files" }, + + /* WTAP_ENCAP_SLL2 */ + { "linux-sll2", "Linux cooked-mode capture v2" }, }; WS_DLL_LOCAL |