aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ipx.h
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-08-07 03:21:25 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-08-07 03:21:25 +0000
commitd0b97c7d7f4ef5fd35c566a79f20afff08aabcd6 (patch)
tree33bbe4cfb92d0ba70d2d9909cfe9763031f5c77c /packet-ipx.h
parent3d70b052d045de2fdf59185b1c1d744e54e63587 (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()". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2218 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-ipx.h')
-rw-r--r--packet-ipx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-ipx.h b/packet-ipx.h
index b29e72e1ca..2e0ffbbc16 100644
--- a/packet-ipx.h
+++ b/packet-ipx.h
@@ -2,7 +2,7 @@
* Routines for NetWare's IPX
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-ipx.h,v 1.8 2000/06/15 03:48:41 gram Exp $
+ * $Id: packet-ipx.h,v 1.9 2000/08/07 03:20:45 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -142,5 +142,5 @@ gchar* ipxnet_to_string(const guint8 *ad);
gchar* ipxnet_to_str_punct(const guint32 ad, char punct);
void capture_ipx(const u_char *, int, packet_counts *);
-void dissect_ipx(const u_char *, int, frame_data*, proto_tree *);
+void dissect_ipx(tvbuff_t *, packet_info *, proto_tree *);