diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-01-28 03:39:48 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-01-28 03:39:48 +0000 |
commit | b2ae96ed4dd50870b593bd7abfb7d222cea5b7e6 (patch) | |
tree | 1403addb62187af84eaa9f4902e74d9c269bb3b0 /packet-ypserv.c | |
parent | 67fb5332334da6483ef4a843521c1df4ab731ace (diff) |
Allow dissectors of ONC RPC-based protocols to register themselves
either with a table of old-style dissectors or a table of tvbuffified
dissectors, and have the RPC dissector pass the appropriate arguments to
the dissectors.
Finish tvbuffifying the NLM dissector, getting rid of the last traces of
old-style dissector code.
In those routines in the NFS dissector that take new-style arguments
(because they're called from the NLM dissector), make them take an
offset as an argument, so they don't assume that they're handed a tvbuff
starting at the stuff they're supposed to dissect, and make the versions
that take old-style arguments construct a tvbuff and call the versions
that take new-style arguments. Do the latter with the routines in
"packet-rpc.c" as well.
svn path=/trunk/; revision=2943
Diffstat (limited to 'packet-ypserv.c')
-rw-r--r-- | packet-ypserv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packet-ypserv.c b/packet-ypserv.c index 5a478a5657..672143c903 100644 --- a/packet-ypserv.c +++ b/packet-ypserv.c @@ -1,7 +1,7 @@ /* packet-ypserv.c * Routines for ypserv dissection * - * $Id: packet-ypserv.c,v 1.13 2001/01/18 09:55:10 guy Exp $ + * $Id: packet-ypserv.c,v 1.14 2001/01/28 03:39:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -153,7 +153,7 @@ int dissect_firstnext_reply(const u_char *pd, int offset, frame_data *fd, /* NULL as function pointer means: type of arguments is "void". */ /* someone please get me a version 1 trace */ -static const vsff ypserv1_proc[] = { +static const old_vsff ypserv1_proc[] = { { 0, "NULL", NULL, NULL }, { YPPROC_ALL, "ALL", NULL, NULL }, @@ -181,7 +181,7 @@ static const vsff ypserv1_proc[] = { }; /* end of YPServ version 2 */ -static const vsff ypserv2_proc[] = { +static const old_vsff ypserv2_proc[] = { { 0, "NULL", NULL, NULL }, { YPPROC_ALL, "ALL", NULL, NULL }, @@ -252,6 +252,6 @@ proto_reg_handoff_ypserv(void) /* Register the protocol as RPC */ rpc_init_prog(proto_ypserv, YPSERV_PROGRAM, ett_ypserv); /* Register the procedure tables */ - rpc_init_proc_table(YPSERV_PROGRAM, 1, ypserv1_proc); - rpc_init_proc_table(YPSERV_PROGRAM, 2, ypserv2_proc); + old_rpc_init_proc_table(YPSERV_PROGRAM, 1, ypserv1_proc); + old_rpc_init_proc_table(YPSERV_PROGRAM, 2, ypserv2_proc); } |