diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-07-21 12:37:11 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-07-21 19:38:15 +0000 |
| commit | 868cd679154e6060bf22945e760ada61988fbd94 (patch) | |
| tree | 82a031c024bfd130d219e202d54a6823293591bb /epan/dissectors/packet-glusterfs_hndsk.c | |
| parent | f38d976cbed60c370e127bd40396cedf17644cee (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-glusterfs_hndsk.c')
| -rw-r--r-- | epan/dissectors/packet-glusterfs_hndsk.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/epan/dissectors/packet-glusterfs_hndsk.c b/epan/dissectors/packet-glusterfs_hndsk.c index b077f1ea6b..291f46d6c3 100644 --- a/epan/dissectors/packet-glusterfs_hndsk.c +++ b/epan/dissectors/packet-glusterfs_hndsk.c @@ -230,6 +230,12 @@ static const vsff gluster_hndsk_2_proc[] = { }; +static const rpc_prog_vers_info gluster_hndsk_vers_info[] = { + { 1, gluster_hndsk_proc, &hf_gluster_hndsk_proc }, + { 2, gluster_hndsk_2_proc, &hf_gluster_hndsk_proc }, +}; + + static const value_string gluster_hndsk_proc_vals[] = { { GF_HNDSK_NULL, "NULL" }, { GF_HNDSK_SETVOLUME, "DUMP" }, @@ -301,11 +307,8 @@ void proto_reg_handoff_gluster_hndsk(void) { rpc_init_prog(proto_gluster_hndsk, GLUSTER_HNDSK_PROGRAM, - ett_gluster_hndsk); - rpc_init_proc_table(proto_gluster_hndsk, GLUSTER_HNDSK_PROGRAM, 1, gluster_hndsk_proc, - hf_gluster_hndsk_proc); - rpc_init_proc_table(proto_gluster_hndsk, GLUSTER_HNDSK_PROGRAM, 2, gluster_hndsk_2_proc, - hf_gluster_hndsk_proc); + ett_gluster_hndsk, + G_N_ELEMENTS(gluster_hndsk_vers_info), gluster_hndsk_vers_info); } /* Legacy GlusterFS Callback procedures, they don't contain any data. */ @@ -315,6 +318,9 @@ static const vsff gluster_cbk_proc[] = { { GF_CBK_INO_FLUSH, "INO_FLUSH", dissect_rpc_unknown, dissect_rpc_unknown }, { 0, NULL, NULL, NULL } }; +static const rpc_prog_vers_info gluster_cbk_vers_info[] = { + { 1, gluster_cbk_proc, &hf_gluster_cbk_proc }, +}; static const value_string gluster_cbk_proc_vals[] = { { GF_CBK_NULL, "NULL" }, { GF_CBK_FETCHSPEC, "FETCHSPEC" }, @@ -350,9 +356,8 @@ proto_register_gluster_cbk(void) void proto_reg_handoff_gluster_cbk(void) { - rpc_init_prog(proto_gluster_cbk, GLUSTER_CBK_PROGRAM, ett_gluster_cbk); - rpc_init_proc_table(proto_gluster_cbk, GLUSTER_CBK_PROGRAM, 1, gluster_cbk_proc, - hf_gluster_cbk_proc); + rpc_init_prog(proto_gluster_cbk, GLUSTER_CBK_PROGRAM, ett_gluster_cbk, + G_N_ELEMENTS(gluster_cbk_vers_info), gluster_cbk_vers_info); } /* |