diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-01-28 03:39:48 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2001-01-28 03:39:48 +0000 |
| commit | a4f9d750b220ef21285d40ef800215729c3451c3 (patch) | |
| tree | 1403addb62187af84eaa9f4902e74d9c269bb3b0 /packet-portmap.c | |
| parent | c962347647a4aec0bcacaa1c2189d458afa19eec (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2943 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-portmap.c')
| -rw-r--r-- | packet-portmap.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/packet-portmap.c b/packet-portmap.c index 6449f8f92b..f0add47dd1 100644 --- a/packet-portmap.c +++ b/packet-portmap.c @@ -1,7 +1,7 @@ /* packet-portmap.c * Routines for portmap dissection * - * $Id: packet-portmap.c,v 1.23 2001/01/22 07:19:38 guy Exp $ + * $Id: packet-portmap.c,v 1.24 2001/01/28 03:39:48 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -222,7 +222,7 @@ int dissect_dump_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 portmap1_proc[] = { +static const old_vsff portmap1_proc[] = { { PORTMAPPROC_NULL, "NULL", NULL, NULL }, { PORTMAPPROC_SET, "SET", NULL, NULL }, { PORTMAPPROC_UNSET, "UNSET", NULL, NULL }, @@ -233,7 +233,7 @@ static const vsff portmap1_proc[] = { }; /* end of Portmap version 1 */ -static const vsff portmap2_proc[] = { +static const old_vsff portmap2_proc[] = { { PORTMAPPROC_NULL, "NULL", NULL, NULL }, { PORTMAPPROC_SET, "SET", @@ -327,7 +327,7 @@ int dissect_rpcb3_dump_reply(const u_char *pd, int offset, frame_data *fd, /* Portmapper version 3, RFC 1833, Page 7 */ -static const vsff portmap3_proc[] = { +static const old_vsff portmap3_proc[] = { { RPCBPROC_NULL, "NULL", NULL, NULL }, { RPCBPROC_SET, "SET", @@ -352,7 +352,7 @@ static const vsff portmap3_proc[] = { /* Portmapper version 4, RFC 1833, Page 8 */ -static const vsff portmap4_proc[] = { +static const old_vsff portmap4_proc[] = { { RPCBPROC_NULL, "NULL", NULL, NULL }, { RPCBPROC_SET, "SET", @@ -444,8 +444,8 @@ proto_reg_handoff_portmap(void) /* Register the protocol as RPC */ rpc_init_prog(proto_portmap, PORTMAP_PROGRAM, ett_portmap); /* Register the procedure tables */ - rpc_init_proc_table(PORTMAP_PROGRAM, 1, portmap1_proc); - rpc_init_proc_table(PORTMAP_PROGRAM, 2, portmap2_proc); - rpc_init_proc_table(PORTMAP_PROGRAM, 3, portmap3_proc); - rpc_init_proc_table(PORTMAP_PROGRAM, 4, portmap4_proc); + old_rpc_init_proc_table(PORTMAP_PROGRAM, 1, portmap1_proc); + old_rpc_init_proc_table(PORTMAP_PROGRAM, 2, portmap2_proc); + old_rpc_init_proc_table(PORTMAP_PROGRAM, 3, portmap3_proc); + old_rpc_init_proc_table(PORTMAP_PROGRAM, 4, portmap4_proc); } |