From a4ba8da26f053db714d77943c01090e968724273 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Mon, 18 Oct 2021 12:28:48 +0200 Subject: api: remove legacy pd msg handlers While looking at a coverity warning it was discovered that it's caused by return value modified by pd msg handlers. As these are legacy, it's a good time to remove them and also fix the warning this way. Type: fix Signed-off-by: Klement Sekera Change-Id: Ic72ab8b2b7a2e55188d1c31cfd18a74b7cf82c43 --- src/vlibapi/api_common.h | 2 -- src/vlibapi/api_helper_macros.h | 9 --------- src/vlibapi/api_shared.c | 35 ----------------------------------- src/vnet/gre/gre_api.c | 1 - src/vnet/ipip/ipip_api.c | 1 - 5 files changed, 48 deletions(-) (limited to 'src') diff --git a/src/vlibapi/api_common.h b/src/vlibapi/api_common.h index a955636ba3f..320e7c44e16 100644 --- a/src/vlibapi/api_common.h +++ b/src/vlibapi/api_common.h @@ -232,8 +232,6 @@ typedef struct api_main_t { /** Message handler vector */ void (**msg_handlers) (void *); - /** Plaform-dependent (aka hardware) message handler vector */ - int (**pd_msg_handlers) (void *, int); /** non-default message cleanup handler vector */ void (**msg_cleanup_handlers) (void *); diff --git a/src/vlibapi/api_helper_macros.h b/src/vlibapi/api_helper_macros.h index 2e0a62229f3..7a04bb056f2 100644 --- a/src/vlibapi/api_helper_macros.h +++ b/src/vlibapi/api_helper_macros.h @@ -30,7 +30,6 @@ #define REPLY_MACRO(t) \ do { \ vl_api_registration_t *rp; \ - rv = vl_msg_api_pd_handler (mp, rv); \ rp = vl_api_client_index_to_registration (mp->client_index); \ if (rp == 0) \ return; \ @@ -46,7 +45,6 @@ do { \ #define REPLY_MACRO_END(t) \ do { \ vl_api_registration_t *rp; \ - rv = vl_msg_api_pd_handler (mp, rv); \ rp = vl_api_client_index_to_registration (mp->client_index); \ if (rp == 0) \ return; \ @@ -65,7 +63,6 @@ do { \ #define REPLY_MACRO2(t, body) \ do { \ vl_api_registration_t *rp; \ - rv = vl_msg_api_pd_handler (mp, rv); \ rp = vl_api_client_index_to_registration (mp->client_index); \ if (rp == 0) \ return; \ @@ -81,7 +78,6 @@ do { \ #define REPLY_MACRO2_END(t, body) \ do { \ vl_api_registration_t *rp; \ - rv = vl_msg_api_pd_handler (mp, rv); \ rp = vl_api_client_index_to_registration (mp->client_index); \ if (rp == 0) \ return; \ @@ -101,7 +97,6 @@ do { \ #define REPLY_MACRO2_ZERO(t, body) \ do { \ vl_api_registration_t *rp; \ - rv = vl_msg_api_pd_handler (mp, rv); \ rp = vl_api_client_index_to_registration (mp->client_index); \ if (rp == 0) \ return; \ @@ -117,7 +112,6 @@ do { \ #define REPLY_MACRO_DETAILS2(t, body) \ do { \ vl_api_registration_t *rp; \ - rv = vl_msg_api_pd_handler (mp, rv); \ rp = vl_api_client_index_to_registration (mp->client_index); \ if (rp == 0) \ return; \ @@ -141,7 +135,6 @@ do { \ #define REPLY_MACRO3(t, n, body) \ do { \ vl_api_registration_t *rp; \ - rv = vl_msg_api_pd_handler (mp, rv); \ rp = vl_api_client_index_to_registration (mp->client_index); \ if (rp == 0) \ return; \ @@ -157,7 +150,6 @@ do { \ #define REPLY_MACRO3_ZERO(t, n, body) \ do { \ vl_api_registration_t *rp; \ - rv = vl_msg_api_pd_handler (mp, rv); \ rp = vl_api_client_index_to_registration (mp->client_index); \ if (rp == 0) \ return; \ @@ -174,7 +166,6 @@ do { \ do { \ vl_api_registration_t *rp; \ u8 is_error = 0; \ - rv = vl_msg_api_pd_handler (mp, rv); \ \ rp = vl_api_client_index_to_registration (mp->client_index); \ if (rp == 0) \ diff --git a/src/vlibapi/api_shared.c b/src/vlibapi/api_shared.c index 52e66f41342..dd51ee5fae1 100644 --- a/src/vlibapi/api_shared.c +++ b/src/vlibapi/api_shared.c @@ -1081,41 +1081,6 @@ vl_msg_api_post_mortem_dump (void) /* Layered message handling support */ -void -vl_msg_api_register_pd_handler (void *fp, u16 msg_id_host_byte_order) -{ - api_main_t *am = vlibapi_get_main (); - - /* Mild idiot proofing */ - if (msg_id_host_byte_order > 10000) - clib_warning ("msg_id_host_byte_order endian issue? %d arg vs %d", - msg_id_host_byte_order, - clib_net_to_host_u16 (msg_id_host_byte_order)); - vec_validate (am->pd_msg_handlers, msg_id_host_byte_order); - am->pd_msg_handlers[msg_id_host_byte_order] = fp; -} - -int -vl_msg_api_pd_handler (void *mp, int rv) -{ - api_main_t *am = vlibapi_get_main (); - int (*fp) (void *, int); - u16 msg_id; - - if (clib_arch_is_little_endian) - msg_id = clib_net_to_host_u16 (*((u16 *) mp)); - else - msg_id = *((u16 *) mp); - - if (msg_id >= vec_len (am->pd_msg_handlers) - || am->pd_msg_handlers[msg_id] == 0) - return rv; - - fp = am->pd_msg_handlers[msg_id]; - rv = (*fp) (mp, rv); - return rv; -} - void vl_msg_api_set_first_available_msg_id (u16 first_avail) { diff --git a/src/vnet/gre/gre_api.c b/src/vnet/gre/gre_api.c index e83635a7820..3b42c76fb12 100644 --- a/src/vnet/gre/gre_api.c +++ b/src/vnet/gre/gre_api.c @@ -130,7 +130,6 @@ static void send_gre_tunnel_details (gre_tunnel_t * t, vl_api_gre_tunnel_dump_t * mp) { vl_api_gre_tunnel_details_t *rmp; - int rv = 0; /* *INDENT-OFF* */ REPLY_MACRO_DETAILS2(VL_API_GRE_TUNNEL_DETAILS, diff --git a/src/vnet/ipip/ipip_api.c b/src/vnet/ipip/ipip_api.c index f44c72c3b27..50b6731af44 100644 --- a/src/vnet/ipip/ipip_api.c +++ b/src/vnet/ipip/ipip_api.c @@ -112,7 +112,6 @@ send_ipip_tunnel_details (ipip_tunnel_t * t, vl_api_ipip_tunnel_dump_t * mp) vl_api_ipip_tunnel_details_t *rmp; bool is_ipv6 = t->transport == IPIP_TRANSPORT_IP6 ? true : false; fib_table_t *ft; - int rv = 0; ft = fib_table_get (t->fib_index, (is_ipv6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4)); -- cgit 1.2.3-korg