From 868cd679154e6060bf22945e760ada61988fbd94 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 21 Jul 2015 12:37:11 -0700 Subject: 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 --- epan/dissectors/packet-hclnfsd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-hclnfsd.c') diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c index 675c92b5d5..005483fc0f 100644 --- a/epan/dissectors/packet-hclnfsd.c +++ b/epan/dissectors/packet-hclnfsd.c @@ -676,6 +676,9 @@ static const vsff hclnfsd1_proc[] = { dissect_rpc_unknown, dissect_rpc_unknown }, { 0, NULL, NULL, NULL } }; +static const rpc_prog_vers_info hclnfsd_vers_info[] = { + { 1, hclnfsd1_proc, &hf_hclnfsd_procedure_v1 }, +}; static const value_string hclnfsd1_proc_vals[] = { { HCLNFSDPROC_NULL, "NULL" }, { HCLNFSDPROC_SPOOL_INQUIRE, "SPOOL_INQUIRE" }, @@ -902,10 +905,8 @@ void proto_reg_handoff_hclnfsd(void) { /* Register the protocol as RPC */ - rpc_init_prog(proto_hclnfsd, HCLNFSD_PROGRAM, ett_hclnfsd); - - /* Register the procedure tables */ - rpc_init_proc_table(proto_hclnfsd, HCLNFSD_PROGRAM, 1, hclnfsd1_proc, hf_hclnfsd_procedure_v1); + rpc_init_prog(proto_hclnfsd, HCLNFSD_PROGRAM, ett_hclnfsd, + G_N_ELEMENTS(hclnfsd_vers_info), hclnfsd_vers_info); } /* -- cgit v1.2.3