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-ddtp.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'packet-ddtp.c') diff --git a/packet-ddtp.c b/packet-ddtp.c index ff73f6c3c4..5f8c3efd54 100644 --- a/packet-ddtp.c +++ b/packet-ddtp.c @@ -3,7 +3,7 @@ * see http://ddt.sourceforge.net/ * Olivier Abad * - * $Id: packet-ddtp.c,v 1.8 2000/06/15 03:48:40 gram Exp $ + * $Id: packet-ddtp.c,v 1.9 2000/08/07 03:20:27 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -97,21 +97,11 @@ static const value_string vals_ddtp_status[] = { { 0, NULL} }; -#if 0 static void dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *ddtp_tree; proto_item *ti; -#else -static void -dissect_ddtp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) -{ - proto_tree *ddtp_tree; - proto_item *ti; - packet_info *pinfo = π - tvbuff_t *tvb = tvb_create_from_top(offset); -#endif pinfo->current_proto = "DDTP"; if (check_col(pinfo->fd, COL_PROTOCOL)) { @@ -120,14 +110,9 @@ dissect_ddtp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) } if (tree) { ti = proto_tree_add_item(tree, proto_ddtp, tvb, 0, - END_OF_FRAME - offset, FALSE); + tvb_length(tvb), FALSE); ddtp_tree = proto_item_add_subtree(ti, ett_ddtp); - if (!BYTES_ARE_IN_FRAME(offset, 4)) { - proto_tree_add_text(ddtp_tree, NullTVB, offset, tvb_length(tvb), - "Frame too short"); - return; - } proto_tree_add_item(ddtp_tree, hf_ddtp_version, tvb, 0, 4, FALSE); proto_tree_add_item(ddtp_tree, hf_ddtp_encrypt, tvb, 4, 4, FALSE); proto_tree_add_item(ddtp_tree, hf_ddtp_hostid, tvb, 8, 4, FALSE); -- cgit v1.2.3