diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-04-03 05:42:11 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-04-03 05:42:11 +0000 |
| commit | 6617c40dd77ec224fdab6fa96ac07f6ed09ad273 (patch) | |
| tree | e4ac94d232abcfeb5018b25c1e86cec4e748cf32 /packet-gre.c | |
| parent | a817e9701520b38846b55b4c6d00981ad52f0ced (diff) | |
| download | wireshark-6617c40dd77ec224fdab6fa96ac07f6ed09ad273.tar.gz wireshark-6617c40dd77ec224fdab6fa96ac07f6ed09ad273.tar.bz2 wireshark-6617c40dd77ec224fdab6fa96ac07f6ed09ad273.zip | |
An Ethernet type of 0x6558 is "Transparent Ethernet Bridging" which,
apparently, means an Ethernet packet is stuffed into the payload; add
support for it as an Ethernet, Cisco HDLC, and GRE packet type.
Sort the Ethernet types in "etypes.h" by value.
svn path=/trunk/; revision=3250
Diffstat (limited to 'packet-gre.c')
| -rw-r--r-- | packet-gre.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/packet-gre.c b/packet-gre.c index 28889464cb..d5f1a8b490 100644 --- a/packet-gre.c +++ b/packet-gre.c @@ -2,7 +2,7 @@ * Routines for the Generic Routing Encapsulation (GRE) protocol * Brad Robel-Forrest <brad.robel-forrest@watchguard.com> * - * $Id: packet-gre.c,v 1.39 2001/01/22 00:20:29 guy Exp $ + * $Id: packet-gre.c,v 1.40 2001/04/03 05:42:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -69,12 +69,13 @@ static void add_flags_and_ver(proto_tree *, guint16, tvbuff_t *, int, int); static void dissect_gre_wccp2_redirect_header(tvbuff_t *, int, proto_tree *); static const value_string typevals[] = { - { ETHERTYPE_PPP, "PPP" }, - { ETHERTYPE_IP, "IP" }, - { GRE_WCCP, "WCCP"}, - { ETHERTYPE_IPX, "IPX"}, - { GRE_FR, "FR"}, - { 0, NULL } + { ETHERTYPE_PPP, "PPP" }, + { ETHERTYPE_IP, "IP" }, + { GRE_WCCP, "WCCP"}, + { ETHERTYPE_IPX, "IPX"}, + { ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" }, + { GRE_FR, "Frame Relay"}, + { 0, NULL } }; static void |