aboutsummaryrefslogtreecommitdiffstats
path: root/packet-vines.c
diff options
context:
space:
mode:
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-vines.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-vines.c')
-rw-r--r--packet-vines.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-vines.c b/packet-vines.c
index daa89958da..23889a993f 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
/* packet-vines.c
* Routines for Banyan VINES protocol packet disassembly
*
- * $Id: packet-vines.c,v 1.16 2000/05/11 08:15:54 gram Exp $
+ * $Id: packet-vines.c,v 1.17 2000/08/07 03:21:18 guy Exp $
*
* Don Lafontaine <lafont02@cn.ca>
*
@@ -249,7 +249,7 @@ dissect_vines(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
dissect_vines_spp(pd, offset, fd, tree);
break;
default:
- dissect_data(pd, offset, fd, tree);
+ old_dissect_data(pd, offset, fd, tree);
break;
}
}
@@ -335,7 +335,7 @@ void dissect_vines_spp(const u_char *pd, int offset, frame_data *fd, proto_tree
proto_tree_add_text(vspp_tree, NullTVB, offset+14, 2, "Window: 0x%04x", viph.vspp_win);
}
offset += 16; /* sizeof SPP */
- dissect_data(pd, offset, fd, tree);
+ old_dissect_data(pd, offset, fd, tree);
}
void
@@ -353,7 +353,7 @@ proto_register_vines(void)
void
proto_reg_handoff_vines(void)
{
- dissector_add("ethertype", ETHERTYPE_VINES, dissect_vines);
- dissector_add("ppp.protocol", PPP_VINES, dissect_vines);
- dissector_add("ip.proto", IP_PROTO_VINES, dissect_vines_frp);
+ old_dissector_add("ethertype", ETHERTYPE_VINES, dissect_vines);
+ old_dissector_add("ppp.protocol", PPP_VINES, dissect_vines);
+ old_dissector_add("ip.proto", IP_PROTO_VINES, dissect_vines_frp);
}