aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/policer/policer.h2
-rw-r--r--src/vnet/policer/policer_api.c60
-rw-r--r--src/vnet/vnet_all_api_h.h1
3 files changed, 9 insertions, 54 deletions
diff --git a/src/vnet/policer/policer.h b/src/vnet/policer/policer.h
index d9c4ed2a451..2687064bf0d 100644
--- a/src/vnet/policer/policer.h
+++ b/src/vnet/policer/policer.h
@@ -49,6 +49,8 @@ typedef struct
/* frame queue for thread handoff */
u32 fq_index;
+
+ u16 msg_id_base;
} vnet_policer_main_t;
extern vnet_policer_main_t vnet_policer_main;
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;
}
diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h
index 53f61fa8803..872729cc441 100644
--- a/src/vnet/vnet_all_api_h.h
+++ b/src/vnet/vnet_all_api_h.h
@@ -46,7 +46,6 @@
#include <vnet/mpls/mpls.api.h>
#include <vnet/srv6/sr.api.h>
#include <vnet/srmpls/sr_mpls.api.h>
-#include <vnet/policer/policer.api.h>
#include <vnet/ethernet/p2p_ethernet.api.h>
#include <vnet/tcp/tcp.api.h>
#include <vnet/ip/punt.api.h>