policer: API cleanup

[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 fb5f08b..b543a3c 100644 (file)
--- a/src/vnet/policer/policer_api.c
+++ b/src/vnet/policer/policer_api.c
@@ -58,21 +58,26 @@ vl_api_policer_add_del_t_handler (vl_api_policer_add_del_t * mp)
   u32 policer_index;
 
   name = format (0, "%s", mp->name);
+  vec_terminate_c_string (name);
 
-  memset (&cfg, 0, sizeof (cfg));
+  clib_memset (&cfg, 0, sizeof (cfg));
   cfg.rfc = mp->type;
   cfg.rnd_type = mp->round_type;
   cfg.rate_type = mp->rate_type;
-  cfg.rb.kbps.cir_kbps = mp->cir;
-  cfg.rb.kbps.eir_kbps = mp->eir;
-  cfg.rb.kbps.cb_bytes = mp->cb;
-  cfg.rb.kbps.eb_bytes = mp->eb;
-  cfg.conform_action.action_type = mp->conform_action_type;
-  cfg.conform_action.dscp = mp->conform_dscp;
-  cfg.exceed_action.action_type = mp->exceed_action_type;
-  cfg.exceed_action.dscp = mp->exceed_dscp;
-  cfg.violate_action.action_type = mp->violate_action_type;
-  cfg.violate_action.dscp = mp->violate_dscp;
+  cfg.rb.kbps.cir_kbps = ntohl (mp->cir);
+  cfg.rb.kbps.eir_kbps = ntohl (mp->eir);
+  cfg.rb.kbps.cb_bytes = clib_net_to_host_u64 (mp->cb);
+  cfg.rb.kbps.eb_bytes = clib_net_to_host_u64 (mp->eb);
+  cfg.conform_action.action_type =
+    (sse2_qos_action_type_en) mp->conform_action.type;
+  cfg.conform_action.dscp = mp->conform_action.dscp;
+  cfg.exceed_action.action_type =
+    (sse2_qos_action_type_en) mp->exceed_action.type;
+  cfg.exceed_action.dscp = mp->exceed_action.dscp;
+  cfg.violate_action.action_type =
+    (sse2_qos_action_type_en) mp->violate_action.type;
+  cfg.violate_action.dscp = mp->violate_action.dscp;
+
   cfg.color_aware = mp->color_aware;
 
   error = policer_add_del (vm, name, &cfg, &policer_index, mp->is_add);
@@ -95,27 +100,30 @@ static void
 send_policer_details (u8 * name,
                      sse2_qos_pol_cfg_params_st * config,
                      policer_read_response_type_st * templ,
-                     unix_shared_memory_queue_t * q, u32 context)
+                     vl_api_registration_t * reg, u32 context)
 {
   vl_api_policer_details_t *mp;
 
   mp = vl_msg_api_alloc (sizeof (*mp));
-  memset (mp, 0, sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
   mp->_vl_msg_id = ntohs (VL_API_POLICER_DETAILS);
   mp->context = context;
   mp->cir = htonl (config->rb.kbps.cir_kbps);
   mp->eir = htonl (config->rb.kbps.eir_kbps);
-  mp->cb = htonl (config->rb.kbps.cb_bytes);
-  mp->eb = htonl (config->rb.kbps.eb_bytes);
+  mp->cb = clib_host_to_net_u64 (config->rb.kbps.cb_bytes);
+  mp->eb = clib_host_to_net_u64 (config->rb.kbps.eb_bytes);
   mp->rate_type = config->rate_type;
   mp->round_type = config->rnd_type;
   mp->type = config->rfc;
-  mp->conform_action_type = config->conform_action.action_type;
-  mp->conform_dscp = config->conform_action.dscp;
-  mp->exceed_action_type = config->exceed_action.action_type;
-  mp->exceed_dscp = config->exceed_action.dscp;
-  mp->violate_action_type = config->violate_action.action_type;
-  mp->violate_dscp = config->violate_action.dscp;
+  mp->conform_action.type =
+    (vl_api_sse2_qos_action_type_t) config->conform_action.action_type;
+  mp->conform_action.dscp = config->conform_action.dscp;
+  mp->exceed_action.type =
+    (vl_api_sse2_qos_action_type_t) config->exceed_action.action_type;
+  mp->exceed_action.dscp = config->exceed_action.dscp;
+  mp->violate_action.type =
+    (vl_api_sse2_qos_action_type_t) config->violate_action.action_type;
+  mp->violate_action.dscp = config->violate_action.dscp;
   mp->single_rate = templ->single_rate ? 1 : 0;
   mp->color_aware = templ->color_aware ? 1 : 0;
   mp->scale = htonl (templ->scale);
@@ -129,13 +137,13 @@ send_policer_details (u8 * name,
 
   strncpy ((char *) mp->name, (char *) name, ARRAY_LEN (mp->name) - 1);
 
-  vl_msg_api_send_shmem (q, (u8 *) & mp);
+  vl_api_send_msg (reg, (u8 *) mp);
 }
 
 static void
 vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
 {
-  unix_shared_memory_queue_t *q;
+  vl_api_registration_t *reg;
   vnet_policer_main_t *pm = &vnet_policer_main;
   hash_pair_t *hp;
   uword *p;
@@ -145,13 +153,14 @@ vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
   sse2_qos_pol_cfg_params_st *config;
   policer_read_response_type_st *templ;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   if (mp->match_name_valid)
     {
       match_name = format (0, "%s%c", mp->match_name, 0);
+      vec_terminate_c_string (match_name);
     }
 
   if (mp->match_name_valid)
@@ -162,7 +171,7 @@ vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
          pool_index = p[0];
          config = pool_elt_at_index (pm->configs, pool_index);
          templ = pool_elt_at_index (pm->policer_templates, pool_index);
-         send_policer_details (match_name, config, templ, q, mp->context);
+         send_policer_details (match_name, config, templ, reg, mp->context);
        }
     }
   else
@@ -174,7 +183,7 @@ vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
         pool_index = hp->value[0];
         config = pool_elt_at_index (pm->configs, pool_index);
         templ = pool_elt_at_index (pm->policer_templates, pool_index);
-        send_policer_details(name, config, templ, q, mp->context);
+        send_policer_details(name, config, templ, reg, mp->context);
       }));
       /* *INDENT-ON* */
     }
@@ -183,7 +192,7 @@ 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 alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
@@ -202,7 +211,7 @@ setup_message_id_table (api_main_t * am)
 static clib_error_t *
 policer_api_hookup (vlib_main_t * vm)
 {
-  api_main_t *am = &api_main;
+  api_main_t *am = vlibapi_get_main ();
 
 #define _(N,n)                                                  \
     vl_msg_api_set_handlers(VL_API_##N, #n,                     \