diff options
author | Guy Harris <guy@alum.mit.edu> | 2000-08-07 03:21:25 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2000-08-07 03:21:25 +0000 |
commit | 56b989e0adbbbdb7b5f0e9edeb47dc7ebd44ced0 (patch) | |
tree | 33bbe4cfb92d0ba70d2d9909cfe9763031f5c77c /packet-data.c | |
parent | a60203b3c6656798f1be051910a997091b734c2d (diff) |
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
Diffstat (limited to 'packet-data.c')
-rw-r--r-- | packet-data.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packet-data.c b/packet-data.c index f7563fd383..fcdbb956e5 100644 --- a/packet-data.c +++ b/packet-data.c @@ -2,7 +2,7 @@ * Routines for raw data (default case) * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-data.c,v 1.18 2000/05/12 06:23:33 gram Exp $ + * $Id: packet-data.c,v 1.19 2000/08/07 03:20:27 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -40,8 +40,9 @@ */ int proto_data = -1; +/* Remove this once all dissectors are converted to use tvbuffs */ void -dissect_data(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) +old_dissect_data(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { if (IS_DATA_IN_FRAME(offset) && tree) { proto_tree_add_protocol_format(tree, proto_data, NullTVB, offset, @@ -50,9 +51,8 @@ dissect_data(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) } } -/* This will become dissect_data() once all dissectors are converted to use tvbuffs */ void -dissect_data_tvb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { int bytes; |