From d0b97c7d7f4ef5fd35c566a79f20afff08aabcd6 Mon Sep 17 00:00:00 2001 From: guy 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()". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2218 f5534014-38df-0310-8fa8-9805f1628bb7 --- packet-sna.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'packet-sna.c') diff --git a/packet-sna.c b/packet-sna.c index 4baf87f603..dd3a35f326 100644 --- a/packet-sna.c +++ b/packet-sna.c @@ -2,7 +2,7 @@ * Routines for SNA * Gilbert Ramirez * - * $Id: packet-sna.c,v 1.16 2000/05/31 05:07:44 guy Exp $ + * $Id: packet-sna.c,v 1.17 2000/08/07 03:21:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -364,7 +364,7 @@ dissect_sna(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { th_header_len = dissect_fidf(pd, offset, fd, th_tree); break; default: - dissect_data(pd, offset+1, fd, tree); + old_dissect_data(pd, offset+1, fd, tree); } sna_header_len += th_header_len; @@ -397,7 +397,7 @@ dissect_sna(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { } if (IS_DATA_IN_FRAME(offset+1)) { - dissect_data(pd, offset, fd, tree); + old_dissect_data(pd, offset, fd, tree); } } @@ -1206,5 +1206,5 @@ proto_register_sna(void) void proto_reg_handoff_sna(void) { - dissector_add("llc.dsap", SAP_SNA_PATHCTRL, dissect_sna); + old_dissector_add("llc.dsap", SAP_SNA_PATHCTRL, dissect_sna); } -- cgit v1.2.3