aboutsummaryrefslogtreecommitdiffstats
path: root/packet-mpls.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-05-15 19:54:10 +0000
committerGuy Harris <guy@alum.mit.edu>2004-05-15 19:54:10 +0000
commitc5ab4d9ed3f8aba83dded783f845a6ac86f00e57 (patch)
tree12895c8d734be3a194794da557bc247ddf579ba7 /packet-mpls.c
parent7e7d7ab15a2578b8129eb8d5b06575ff8b4fdb81 (diff)
From Carlos Pignataro: support for MPLS over GRE.
svn path=/trunk/; revision=10904
Diffstat (limited to 'packet-mpls.c')
-rw-r--r--packet-mpls.c3
1 files changed, 2 insertions, 1 deletions
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);
}