From 102e8a5d60728cfaa8e60733ee21c3759edabfbe Mon Sep 17 00:00:00 2001
From: Filip Tehlar <ftehlar@cisco.com>
Date: Tue, 22 Jun 2021 08:37:26 +0000
Subject: policer: api cleanup

Use autogenerated code.
Does not change API definitions.

Type: improvement

Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Change-Id: I5dd30870443a22a7da65f6b5a6d3967991e2aceb
---
 src/vnet/policer/policer_api.c | 60 +++++-------------------------------------
 1 file changed, 7 insertions(+), 53 deletions(-)

(limited to 'src/vnet/policer/policer_api.c')

diff --git a/src/vnet/policer/policer_api.c b/src/vnet/policer/policer_api.c
index c3a9800e201..1382d17e2de 100644
--- a/src/vnet/policer/policer_api.c
+++ b/src/vnet/policer/policer_api.c
@@ -24,30 +24,13 @@
 #include <vnet/api_errno.h>
 #include <vnet/policer/policer.h>
 
-#include <vnet/vnet_msg_enum.h>
-
-#define vl_typedefs		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_typedefs
-
-#define vl_endianfun		/* define message structures */
-#include <vnet/vnet_all_api_h.h>
-#undef vl_endianfun
-
-/* instantiate all the print functions we know about */
-#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
-#define vl_printfun
-#include <vnet/vnet_all_api_h.h>
-#undef vl_printfun
+#include <vnet/format_fns.h>
+#include <vnet/policer/policer.api_enum.h>
+#include <vnet/policer/policer.api_types.h>
 
+#define REPLY_MSG_ID_BASE vnet_policer_main.msg_id_base
 #include <vlibapi/api_helper_macros.h>
 
-#define foreach_vpe_api_msg                                                   \
-  _ (POLICER_ADD_DEL, policer_add_del)                                        \
-  _ (POLICER_BIND, policer_bind)                                              \
-  _ (POLICER_INPUT, policer_input)                                            \
-  _ (POLICER_DUMP, policer_dump)
-
 static void
 vl_api_policer_add_del_t_handler (vl_api_policer_add_del_t * mp)
 {
@@ -150,7 +133,7 @@ send_policer_details (u8 *name, qos_pol_cfg_params_st *config,
 
   mp = vl_msg_api_alloc (sizeof (*mp));
   clib_memset (mp, 0, sizeof (*mp));
-  mp->_vl_msg_id = ntohs (VL_API_POLICER_DETAILS);
+  mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_POLICER_DETAILS);
   mp->context = context;
   mp->cir = htonl (config->rb.kbps.cir_kbps);
   mp->eir = htonl (config->rb.kbps.eir_kbps);
@@ -233,43 +216,14 @@ vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
     }
 }
 
-/*
- * policer_api_hookup
- * Add vpe's API message handlers to the table.
- * vlib has already mapped shared memory and
- * added the client registration handlers.
- * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
- */
-#define vl_msg_name_crc_list
-#include <vnet/vnet_all_api_h.h>
-#undef vl_msg_name_crc_list
-
-static void
-setup_message_id_table (api_main_t * am)
-{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
-  foreach_vl_msg_name_crc_policer;
-#undef _
-}
-
+#include <vnet/policer/policer.api.c>
 static clib_error_t *
 policer_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = vlibapi_get_main ();
-
-#define _(N,n)                                                  \
-    vl_msg_api_set_handlers(VL_API_##N, #n,                     \
-                           vl_api_##n##_t_handler,              \
-                           vl_noop_handler,                     \
-                           vl_api_##n##_t_endian,               \
-                           vl_api_##n##_t_print,                \
-                           sizeof(vl_api_##n##_t), 1);
-  foreach_vpe_api_msg;
-#undef _
   /*
    * Set up the (msg_name, crc, message-id) table
    */
-  setup_message_id_table (am);
+  REPLY_MSG_ID_BASE = setup_message_id_table ();
 
   return 0;
 }
-- 
cgit 1.2.3-korg