policer: output interface policer

[vpp.git] / src / vnet / policer / policer_api.c

diff --git a/src/vnet/policer/policer_api.c b/src/vnet/policer/policer_api.c
index eff02fb..4f9baa0 100644 (file)
--- a/src/vnet/policer/policer_api.c
+++ b/src/vnet/policer/policer_api.c
@@ -24,29 +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_DUMP, policer_dump)
-
 static void
 vl_api_policer_add_del_t_handler (vl_api_policer_add_del_t * mp)
 {
@@ -83,7 +67,10 @@ vl_api_policer_add_del_t_handler (vl_api_policer_add_del_t * mp)
   error = policer_add_del (vm, name, &cfg, &policer_index, mp->is_add);
 
   if (error)
-    rv = VNET_API_ERROR_UNSPECIFIED;
+    {
+      rv = VNET_API_ERROR_UNSPECIFIED;
+      clib_error_free (error);
+    }
 
   /* *INDENT-OFF* */
   REPLY_MACRO2(VL_API_POLICER_ADD_DEL_REPLY,
@@ -116,6 +103,54 @@ vl_api_policer_bind_t_handler (vl_api_policer_bind_t *mp)
   REPLY_MACRO (VL_API_POLICER_BIND_REPLY);
 }
 
+static void
+vl_api_policer_input_t_handler (vl_api_policer_input_t *mp)
+{
+  vl_api_policer_bind_reply_t *rmp;
+  u8 *name;
+  u32 sw_if_index;
+  u8 apply;
+  int rv;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  name = format (0, "%s", mp->name);
+  vec_terminate_c_string (name);
+
+  sw_if_index = ntohl (mp->sw_if_index);
+  apply = mp->apply;
+
+  rv = policer_input (name, sw_if_index, VLIB_RX, apply);
+  vec_free (name);
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_POLICER_INPUT_REPLY);
+}
+
+static void
+vl_api_policer_output_t_handler (vl_api_policer_input_t *mp)
+{
+  vl_api_policer_bind_reply_t *rmp;
+  u8 *name;
+  u32 sw_if_index;
+  u8 apply;
+  int rv;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  name = format (0, "%s", mp->name);
+  vec_terminate_c_string (name);
+
+  sw_if_index = ntohl (mp->sw_if_index);
+  apply = mp->apply;
+
+  rv = policer_input (name, sw_if_index, VLIB_TX, apply);
+  vec_free (name);
+
+  BAD_SW_IF_INDEX_LABEL;
+  REPLY_MACRO (VL_API_POLICER_OUTPUT_REPLY);
+}
+
 static void
 send_policer_details (u8 *name, qos_pol_cfg_params_st *config,
                      policer_t *templ, vl_api_registration_t *reg,
@@ -125,7 +160,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);
@@ -208,43 +243,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;
 }