From a2eb507055c9467997711548d63420216ab7b4e9 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 20 May 2022 20:06:01 +0200 Subject: api: deprecate vl_msg_api_set_handlers Type: refactor Change-Id: I7b7ca9ec62cb70243c5b7e87968eab1338d67ec8 Signed-off-by: Damjan Marion --- src/plugins/hs_apps/sapi/vpp_echo_bapi.c | 17 ++++++++++++----- src/plugins/tracedump/tracedump_test.c | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 11 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/hs_apps/sapi/vpp_echo_bapi.c b/src/plugins/hs_apps/sapi/vpp_echo_bapi.c index 0652b864b1d..868cc3a0591 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo_bapi.c +++ b/src/plugins/hs_apps/sapi/vpp_echo_bapi.c @@ -585,11 +585,18 @@ echo_api_hookup (echo_main_t * em) return; #define _(N, n) \ - vl_msg_api_set_handlers (REPLY_MSG_ID_BASE + VL_API_##N, #n, \ - vl_api_##n##_t_handler, vl_api_##n##_t_endian, \ - vl_api_##n##_t_format, sizeof (vl_api_##n##_t), 1, \ - vl_api_##n##_t_tojson, vl_api_##n##_t_fromjson, \ - vl_api_##n##_t_calc_size); + vl_msg_api_config (&(vl_msg_api_msg_config_t){ \ + .id = REPLY_MSG_ID_BASE + VL_API_##N, \ + .name = #n, \ + .handler = vl_api_##n##_t_handler, \ + .endian = vl_api_##n##_t_endian, \ + .format_fn = vl_api_##n##_t_format, \ + .size = sizeof (vl_api_##n##_t), \ + .traced = 1, \ + .tojson = vl_api_##n##_t_tojson, \ + .fromjson = vl_api_##n##_t_fromjson, \ + .calc_size = vl_api_##n##_t_calc_size, \ + }); foreach_quic_echo_msg; #undef _ } diff --git a/src/plugins/tracedump/tracedump_test.c b/src/plugins/tracedump/tracedump_test.c index f2bb63ec85d..1a2c8185fe2 100644 --- a/src/plugins/tracedump/tracedump_test.c +++ b/src/plugins/tracedump/tracedump_test.c @@ -248,12 +248,18 @@ api_trace_clear_capture (vat_main_t * vam) void manual_setup_message_id_table (vat_main_t * vam) { - vl_msg_api_set_handlers ( - VL_API_TRACE_DETAILS + tracedump_test_main.msg_id_base, "trace_details", - vl_api_trace_details_t_handler, vl_api_trace_details_t_endian, - vl_api_trace_details_t_format, sizeof (vl_api_trace_details_t), 1, - vl_api_trace_details_t_tojson, vl_api_trace_details_t_fromjson, - vl_api_trace_details_t_calc_size); + vl_msg_api_config (&(vl_msg_api_msg_config_t){ + .id = VL_API_TRACE_DETAILS + tracedump_test_main.msg_id_base, + .name = "trace_details", + .handler = vl_api_trace_details_t_handler, + .endian = vl_api_trace_details_t_endian, + .format_fn = vl_api_trace_details_t_format, + .size = sizeof (vl_api_trace_details_t), + .traced = 1, + .tojson = vl_api_trace_details_t_tojson, + .fromjson = vl_api_trace_details_t_fromjson, + .calc_size = vl_api_trace_details_t_calc_size, + }); } #define VL_API_LOCAL_SETUP_MESSAGE_ID_TABLE manual_setup_message_id_table -- cgit 1.2.3-korg