diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-05-15 19:54:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-05-15 19:54:10 +0000 |
| commit | c5ab4d9ed3f8aba83dded783f845a6ac86f00e57 (patch) | |
| tree | 12895c8d734be3a194794da557bc247ddf579ba7 | |
| parent | 7e7d7ab15a2578b8129eb8d5b06575ff8b4fdb81 (diff) | |
| download | wireshark-c5ab4d9ed3f8aba83dded783f845a6ac86f00e57.tar.gz | |
From Carlos Pignataro: support for MPLS over GRE.
svn path=/trunk/; revision=10904
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | packet-gre.c | 8 | ||||
| -rw-r--r-- | packet-mpls.c | 3 |
3 files changed, 8 insertions, 4 deletions
@@ -2114,6 +2114,7 @@ Carlos Pignataro <cpignata [AT] cisco.com> { from various IETF PWE3 drafts MPLS PW Control Channel Header Multiprotocol Label Switching Echo [draft-ietf-mpls-lsp-ping-05] + MPLS in Generic Routing Encapsulation (GRE) } Thomas Anders <thomas.anders [AT] blue-cable.de> { 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 } }; diff --git a/packet-mpls.c b/packet-mpls.c index e356b648bf..bc46e9425b 100644 --- a/packet-mpls.c +++ b/packet-mpls.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-mpls.c,v 1.30 2004/05/12 20:20:49 guy Exp $ + * $Id: packet-mpls.c,v 1.31 2004/05/15 19:54:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -280,4 +280,5 @@ proto_reg_handoff_mpls(void) dissector_add("ppp.protocol", PPP_MPLS_UNI, mpls_handle); dissector_add("chdlctype", ETHERTYPE_MPLS, mpls_handle); dissector_add("chdlctype", ETHERTYPE_MPLS_MULTI, mpls_handle); + dissector_add("gre.proto", ETHERTYPE_MPLS, mpls_handle); } |