diff options
author | Guy Harris <guy@alum.mit.edu> | 2000-12-14 08:20:31 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2000-12-14 08:20:31 +0000 |
commit | 13ca5c39d754c287dc5f9adee86aca9fdc820ec6 (patch) | |
tree | 363c9c33cda7869684bc7b282c80617ff4171021 /packet-mpls.c | |
parent | 33474c33cc86f40655b4b2a51d0b7e131e6cda2b (diff) |
PPP patches from Burke Lau to:
add FCS checking;
support Cisco HDLC format in the PPP dissector;
handle MPLS-over-PPP.
svn path=/trunk/; revision=2754
Diffstat (limited to 'packet-mpls.c')
-rw-r--r-- | packet-mpls.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packet-mpls.c b/packet-mpls.c index 846ce723f9..1ff1242714 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.11 2000/11/19 08:54:00 guy Exp $ + * $Id: packet-mpls.c,v 1.12 2000/12/14 08:20:29 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -45,6 +45,9 @@ #include <glib.h> #include "etypes.h" #include "packet.h" +#include "packet-ip.h" +#include "ppptypes.h" +#include "packet-ppp.h" static gint proto_mpls = -1; @@ -197,6 +200,7 @@ void proto_reg_handoff_mpls(void) { old_dissector_add("ethertype", ETHERTYPE_MPLS, dissect_mpls); + old_dissector_add("ppp.protocol", PPP_MPLS_UNI, dissect_mpls); /* * Get a handle for the IP dissector. |