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-vxi11.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-vxi11.c')
| -rw-r--r-- | epan/dissectors/packet-vxi11.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-vxi11.c b/epan/dissectors/packet-vxi11.c index 19c2d71ac6..82e2b17db1 100644 --- a/epan/dissectors/packet-vxi11.c +++ b/epan/dissectors/packet-vxi11.c @@ -923,12 +923,12 @@ proto_reg_handoff_vxi11_core(void) dissect_rpc_void, dissect_device_error }, { 0, NULL, NULL, NULL } }; + static const rpc_prog_vers_info vxi11_core_vers_info[] = { + { VXI11_CORE_VERSION, vxi111_core_proc, &hf_vxi11_core_procedure_v1 }, + }; - rpc_init_prog(proto_vxi11_core, VXI11_CORE_PROGRAM, ett_vxi11_core); - rpc_init_proc_table(proto_vxi11_core, VXI11_CORE_PROGRAM, - VXI11_CORE_VERSION, - vxi111_core_proc, - hf_vxi11_core_procedure_v1); + rpc_init_prog(proto_vxi11_core, VXI11_CORE_PROGRAM, ett_vxi11_core, + G_N_ELEMENTS(vxi11_core_vers_info), vxi11_core_vers_info); } @@ -970,12 +970,12 @@ proto_reg_handoff_vxi11_async(void) dissect_device_link, dissect_device_error }, { 0, NULL, NULL, NULL } }; + static const rpc_prog_vers_info vxi11_async_vers_info[] = { + { VXI11_ASYNC_VERSION, vxi111_async_proc, &hf_vxi11_async_procedure_v1 }, + }; - rpc_init_prog(proto_vxi11_async, VXI11_ASYNC_PROGRAM, ett_vxi11_async); - rpc_init_proc_table(proto_vxi11_async, VXI11_ASYNC_PROGRAM, - VXI11_ASYNC_VERSION, - vxi111_async_proc, - hf_vxi11_async_procedure_v1); + rpc_init_prog(proto_vxi11_async, VXI11_ASYNC_PROGRAM, ett_vxi11_async, + G_N_ELEMENTS(vxi11_async_vers_info), vxi11_async_vers_info); } @@ -1023,12 +1023,12 @@ proto_reg_handoff_vxi11_intr(void) dissect_device_SRQ_parms, dissect_rpc_void }, { 0, NULL, NULL, NULL } }; + static const rpc_prog_vers_info vxi11_intr_vers_info[] = { + { VXI11_INTR_VERSION, vxi111_intr_proc, &hf_vxi11_intr_procedure_v1 }, + }; - rpc_init_prog(proto_vxi11_intr, VXI11_INTR_PROGRAM, ett_vxi11_intr); - rpc_init_proc_table(proto_vxi11_intr, VXI11_INTR_PROGRAM, - VXI11_INTR_VERSION, - vxi111_intr_proc, - hf_vxi11_intr_procedure_v1); + rpc_init_prog(proto_vxi11_intr, VXI11_INTR_PROGRAM, ett_vxi11_intr, + G_N_ELEMENTS(vxi11_intr_vers_info), vxi11_intr_vers_info); } /* |