From b2ae96ed4dd50870b593bd7abfb7d222cea5b7e6 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 28 Jan 2001 03:39:48 +0000 Subject: 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 --- packet-bootparams.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packet-bootparams.c') diff --git a/packet-bootparams.c b/packet-bootparams.c index 9ecbb1791e..c02e4a15a1 100644 --- a/packet-bootparams.c +++ b/packet-bootparams.c @@ -1,7 +1,7 @@ /* packet-bootparams.c * Routines for bootparams dissection * - * $Id: packet-bootparams.c,v 1.15 2001/01/18 09:55:09 guy Exp $ + * $Id: packet-bootparams.c,v 1.16 2001/01/28 03:39:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -140,7 +140,7 @@ int dissect_whoami_reply(const u_char *pd, int offset, frame_data *fd, /* proc number, "proc name", dissect_request, dissect_reply */ /* NULL as function pointer means: type of arguments is "void". */ -static const vsff bootparams1_proc[] = { +static const old_vsff bootparams1_proc[] = { { BOOTPARAMSPROC_NULL, "NULL", NULL, NULL }, { BOOTPARAMSPROC_WHOAMI, "WHOAMI", @@ -191,5 +191,5 @@ proto_reg_handoff_bootparams(void) /* Register the protocol as RPC */ rpc_init_prog(proto_bootparams, BOOTPARAMS_PROGRAM, ett_bootparams); /* Register the procedure tables */ - rpc_init_proc_table(BOOTPARAMS_PROGRAM, 1, bootparams1_proc); + old_rpc_init_proc_table(BOOTPARAMS_PROGRAM, 1, bootparams1_proc); } -- cgit v1.2.3