path: root/packet-nbns.c
diff options
authorGuy Harris <guy@alum.mit.edu>2000-08-07 03:21:25 +0000
committerGuy Harris <guy@alum.mit.edu>2000-08-07 03:21:25 +0000
commit56b989e0adbbbdb7b5f0e9edeb47dc7ebd44ced0 (patch)
tree33bbe4cfb92d0ba70d2d9909cfe9763031f5c77c /packet-nbns.c
parenta60203b3c6656798f1be051910a997091b734c2d (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-nbns.c')
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-nbns.c b/packet-nbns.c
index 48d1f40cd0..d342502d5d 100644
--- a/packet-nbns.c
+++ b/packet-nbns.c
@@ -4,7 +4,7 @@
* Gilbert Ramirez <gram@xiexie.org>
* Much stuff added by Guy Harris <guy@alum.mit.edu>
- * $Id: packet-nbns.c,v 1.43 2000/05/31 05:07:21 guy Exp $
+ * $Id: packet-nbns.c,v 1.44 2000/08/07 03:20:53 guy Exp $
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -1140,7 +1140,7 @@ dissect_nbns(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
if (pi.captured_len < NBNS_HDRLEN) {
col_add_str(fd, COL_INFO, "Short NBNS packet");
- dissect_data(pd, offset, fd, tree);
+ old_dissect_data(pd, offset, fd, tree);
@@ -1759,8 +1759,8 @@ proto_register_nbt(void)
- dissector_add("udp.port", UDP_PORT_NBNS, dissect_nbns);
- dissector_add("udp.port", UDP_PORT_NBDGM, dissect_nbdgm);
- dissector_add("tcp.port", TCP_PORT_NBSS, dissect_nbss);
- dissector_add("tcp.port", TCP_PORT_CIFS, dissect_nbss);
+ old_dissector_add("udp.port", UDP_PORT_NBNS, dissect_nbns);
+ old_dissector_add("udp.port", UDP_PORT_NBDGM, dissect_nbdgm);
+ old_dissector_add("tcp.port", TCP_PORT_NBSS, dissect_nbss);
+ old_dissector_add("tcp.port", TCP_PORT_CIFS, dissect_nbss);