Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bfd: use tw_timer_template instead of legacy wheel
[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
3dc2cdd
..
ae57a93
100644
(file)
--- a/
src/vnet/policer/policer_api.c
+++ b/
src/vnet/policer/policer_api.c
@@
-58,8
+58,9
@@
vl_api_policer_add_del_t_handler (vl_api_policer_add_del_t * mp)
u32 policer_index;
name = format (0, "%s", mp->name);
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.rfc = mp->type;
cfg.rnd_type = mp->round_type;
cfg.rate_type = mp->rate_type;
@@
-95,12
+96,12
@@
static void
send_policer_details (u8 * name,
sse2_qos_pol_cfg_params_st * config,
policer_read_response_type_st * templ,
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));
{
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->_vl_msg_id = ntohs (VL_API_POLICER_DETAILS);
mp->context = context;
mp->cir = htonl (config->rb.kbps.cir_kbps);
@@
-129,13
+130,13
@@
send_policer_details (u8 * name,
strncpy ((char *) mp->name, (char *) name, ARRAY_LEN (mp->name) - 1);
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)
{
}
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;
vnet_policer_main_t *pm = &vnet_policer_main;
hash_pair_t *hp;
uword *p;
@@
-145,13
+146,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;
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);
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)
}
if (mp->match_name_valid)
@@
-162,7
+164,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);
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
}
}
else
@@
-174,7
+176,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);
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* */
}
}));
/* *INDENT-ON* */
}
@@
-183,7
+185,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.
/*
* policer_api_hookup
* Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has alread
y
mapped shared memory and
* added the client registration handlers.
* See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
*/
* added the client registration handlers.
* See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
*/
@@
-202,7
+204,7
@@
setup_message_id_table (api_main_t * am)
static clib_error_t *
policer_api_hookup (vlib_main_t * vm)
{
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, \
#define _(N,n) \
vl_msg_api_set_handlers(VL_API_##N, #n, \