diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-15 19:54:10 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-05-15 19:54:10 +0000 |
| commit | ba2115dbb3bd7db906d2153aa544fda9de767e6a (patch) | |
| tree | 12895c8d734be3a194794da557bc247ddf579ba7 /packet-gre.c | |
| parent | 343de8c245590cfe91343430769b7734ce5f39c3 (diff) | |
From Carlos Pignataro: support for MPLS over GRE.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10904 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-gre.c')
| -rw-r--r-- | packet-gre.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packet-gre.c b/packet-gre.c index 4d45bfd503..757beebf1f 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.55 2004/01/29 03:51:25 guy Exp $ + * $Id: packet-gre.c,v 1.56 2004/05/15 19:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -40,8 +40,9 @@ * See RFC 1701 "Generic Routing Encapsulation (GRE)", RFC 1702 * "Generic Routing Encapsulation over IPv4 networks", RFC 2637 * "Point-to-Point Tunneling Protocol (PPTP)", RFC 2784 "Generic - * Routing Encapsulation (GRE)", and RFC 2890 "Key and Sequence - * Number Extensions to GRE". + * Routing Encapsulation (GRE)", RFC 2890 "Key and Sequence + * Number Extensions to GRE" and draft-ietf-mpls-in-ip-or-gre-07.txt + * "Encapsulating MPLS in IP or Generic Routing Encapsulation (GRE)". */ static int proto_gre = -1; @@ -78,6 +79,7 @@ static const value_string typevals[] = { { ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" }, { GRE_FR, "Frame Relay"}, { ETHERTYPE_IPv6, "IPv6" }, + { ETHERTYPE_MPLS, "MPLS label switched packet" }, { 0, NULL } }; |