From 5d5f85f5e4003476fb6d9a0ccd6ad58ad90e5138 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Fri, 3 Dec 2021 10:48:13 +0000 Subject: api: refactor to use REPLY_MSG_ID_BASE #define REPLY_MSG_ID_BASE is the standard way to define reply message id base, so this refactor makes all the files use that. This is a preparation patch for future safety add-ons which rely on REPLY_MACRO* parameters to be preprocessor tokens identifying the message instead, Type: refactor Signed-off-by: Klement Sekera Change-Id: Ibe3e056a3d9326d08af45bbcb25588b11e870141 --- src/plugins/af_xdp/api.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/plugins/af_xdp/api.c') diff --git a/src/plugins/af_xdp/api.c b/src/plugins/af_xdp/api.c index 45dab284e4c..659825a73b6 100644 --- a/src/plugins/af_xdp/api.c +++ b/src/plugins/af_xdp/api.c @@ -27,6 +27,7 @@ #include #include +#define REPLY_MSG_ID_BASE (rm->msg_id_base) #include static af_xdp_mode_t @@ -78,12 +79,8 @@ vl_api_af_xdp_create_t_handler (vl_api_af_xdp_create_t * mp) af_xdp_create_if (vm, &args); rv = args.rv; - /* *INDENT-OFF* */ - REPLY_MACRO2 (VL_API_AF_XDP_CREATE_REPLY + rm->msg_id_base, - ({ - rmp->sw_if_index = ntohl (args.sw_if_index); - })); - /* *INDENT-ON* */ + REPLY_MACRO2 (VL_API_AF_XDP_CREATE_REPLY, + ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); } static void @@ -111,7 +108,7 @@ vl_api_af_xdp_create_v2_t_handler (vl_api_af_xdp_create_v2_t *mp) rv = args.rv; /* clang-format off */ - REPLY_MACRO2 (VL_API_AF_XDP_CREATE_V2_REPLY + rm->msg_id_base, + REPLY_MACRO2 (VL_API_AF_XDP_CREATE_V2_REPLY, ({ rmp->sw_if_index = ntohl (args.sw_if_index); })); @@ -143,7 +140,7 @@ vl_api_af_xdp_delete_t_handler (vl_api_af_xdp_delete_t * mp) af_xdp_delete_if (vm, rd); reply: - REPLY_MACRO (VL_API_AF_XDP_DELETE_REPLY + rm->msg_id_base); + REPLY_MACRO (VL_API_AF_XDP_DELETE_REPLY); } /* set tup the API message handling tables */ -- cgit 1.2.3-korg