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-mpls.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-mpls.c')
| -rw-r--r-- | packet-mpls.c | 3 |
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); } |