aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-pcnfsd.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-07-21 12:37:11 -0700
committerGuy Harris <guy@alum.mit.edu>2015-07-21 19:38:15 +0000
commit868cd679154e6060bf22945e760ada61988fbd94 (patch)
tree82a031c024bfd130d219e202d54a6823293591bb /epan/dissectors/packet-pcnfsd.c
parentf38d976cbed60c370e127bd40396cedf17644cee (diff)
Do all the work of registering an ONC RPC-based protocol in rpc_init_prog().
Hand it a table of version/procedure table/hf-for-program-number triplets. Change-Id: I2acc03c2da83353165bd422d8537362201c814e2 Reviewed-on: https://code.wireshark.org/review/9740 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-pcnfsd.c')
-rw-r--r--epan/dissectors/packet-pcnfsd.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c
index f12f9db563..de846df790 100644
--- a/epan/dissectors/packet-pcnfsd.c
+++ b/epan/dissectors/packet-pcnfsd.c
@@ -341,6 +341,10 @@ static const value_string pcnfsd2_proc_vals[] = {
};
/* end of PCNFS version 2 */
+static const rpc_prog_vers_info pcnfsd_vers_info[] = {
+ { 1, pcnfsd1_proc, &hf_pcnfsd_procedure_v1 },
+ { 2, pcnfsd2_proc, &hf_pcnfsd_procedure_v2 },
+};
void
proto_register_pcnfsd(void)
@@ -416,10 +420,8 @@ void
proto_reg_handoff_pcnfsd(void)
{
/* Register the protocol as RPC */
- rpc_init_prog(proto_pcnfsd, PCNFSD_PROGRAM, ett_pcnfsd);
- /* Register the procedure tables */
- rpc_init_proc_table(proto_pcnfsd, PCNFSD_PROGRAM, 1, pcnfsd1_proc, hf_pcnfsd_procedure_v1);
- rpc_init_proc_table(proto_pcnfsd, PCNFSD_PROGRAM, 2, pcnfsd2_proc, hf_pcnfsd_procedure_v2);
+ rpc_init_prog(proto_pcnfsd, PCNFSD_PROGRAM, ett_pcnfsd,
+ G_N_ELEMENTS(pcnfsd_vers_info), pcnfsd_vers_info);
}
/*