diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-13 07:47:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-13 07:47:49 +0000 |
| commit | 914d1da71f30cbdd2cc0ac29e808e178001f9562 (patch) | |
| tree | 83661db200a66c8c887f770684abd0475ca4dba3 /packet-fr.c | |
| parent | 2072d03e78e776aeb9b1ea78cdf455a398928dae (diff) | |
Make GRE use a dissector table for its protocol types, and register
dissectors for protcools that can be encapsulated inside GRE in that
table.
Fix a bug in the handling of WCCPv2 IP encapsulation (it was
constructing the next tvbuff before, rather than after, advancing the
offset past the redirection header).
svn path=/trunk/; revision=2893
Diffstat (limited to 'packet-fr.c')
| -rw-r--r-- | packet-fr.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/packet-fr.c b/packet-fr.c index 76066c2ace..89e0c8a597 100644 --- a/packet-fr.c +++ b/packet-fr.c @@ -3,7 +3,7 @@ * * Copyright 2001, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-fr.c,v 1.6 2001/01/10 09:07:35 guy Exp $ + * $Id: packet-fr.c,v 1.7 2001/01/13 07:47:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -40,6 +40,7 @@ #include "xdlc.h" #include "oui.h" #include "nlpid.h" +#include "greproto.h" static gint proto_fr = -1; static gint ett_fr = -1; @@ -228,14 +229,12 @@ void proto_register_fr(void) proto_register_field_array(proto_fr, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_dissector("fr", dissect_fr, proto_fr); - fr_subdissector_table = register_dissector_table("fr.ietf"); fr_cisco_subdissector_table = register_dissector_table("fr.cisco"); - -}; +} void proto_reg_handoff_fr(void) { dissector_add("wtap_encap", WTAP_ENCAP_FRELAY, dissect_fr, proto_fr); + dissector_add("gre.proto", GRE_FR, dissect_fr, proto_fr); } |