From 56b989e0adbbbdb7b5f0e9edeb47dc7ebd44ced0 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 7 Aug 2000 03:21:25 +0000 Subject: Allow either old-style (pre-tvbuff) or new-style (tvbuffified) dissectors to be registered as dissectors for particular ports, registered as heuristic dissectors, and registered as dissectors for conversations, and have routines to be used both by old-style and new-style dissectors to call registered dissectors. Have the code that calls those dissectors translate the arguments as necessary. (For conversation dissectors, replace "find_conversation_dissector()", which just returns a pointer to the dissector, with "old_try_conversation_dissector()" and "try_conversation_dissector()", which actually call the dissector, so that there's a single place at which we can do that translation. Also make "dissector_lookup()" static and, instead of calling it and, if it returns a non-null pointer, calling that dissector, just use "old_dissector_try_port()" or "dissector_try_port()", for the same reason.) This allows some dissectors that took old-style arguments and immediately translated them to new-style arguments to just take new-style arguments; make them do so. It also allows some new-style dissectors not to have to translate arguments before calling routines to look up and call dissectors; make them not do so. Get rid of checks for too-short frames in new-style dissectors - the tvbuff code does those checks for you. Give the routines to register old-style dissectors, and to call dissectors from old-style dissectors, names beginning with "old_", with the routines for new-style dissectors not having the "old_". Update the dissectors that use those routines appropriately. Rename "dissect_data()" to "old_dissect_data()", and "dissect_data_tvb()" to "dissect_data()". svn path=/trunk/; revision=2218 --- packet-gre.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'packet-gre.c') diff --git a/packet-gre.c b/packet-gre.c index fa8e86d1c3..e30bd9a65f 100644 --- a/packet-gre.c +++ b/packet-gre.c @@ -2,7 +2,7 @@ * Routines for the Generic Routing Encapsulation (GRE) protocol * Brad Robel-Forrest * - * $Id: packet-gre.c,v 1.23 2000/06/15 03:48:40 gram Exp $ + * $Id: packet-gre.c,v 1.24 2000/08/07 03:20:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -220,10 +220,12 @@ dissect_gre(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { dissect_ip(pd, offset, fd, tree); break; case GRE_IPX: - dissect_ipx(pd, offset, fd, tree); + next_tvb = tvb_create_from_top(offset); + dissect_ipx(next_tvb, &pi, tree); break; default: - dissect_data(pd, offset, fd, gre_tree); + next_tvb = tvb_create_from_top(offset); + dissect_data(next_tvb, &pi, gre_tree); break; } } @@ -299,5 +301,5 @@ proto_register_gre(void) void proto_reg_handoff_gre(void) { - dissector_add("ip.proto", IP_PROTO_GRE, dissect_gre); + old_dissector_add("ip.proto", IP_PROTO_GRE, dissect_gre); } -- cgit v1.2.3