Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
c11 safe string handling support
[vpp.git]
/
src
/
vnet
/
lisp-cp
/
lisp_cli.c
diff --git
a/src/vnet/lisp-cp/lisp_cli.c
b/src/vnet/lisp-cp/lisp_cli.c
index
738dda7
..
690850c
100644
(file)
--- a/
src/vnet/lisp-cp/lisp_cli.c
+++ b/
src/vnet/lisp-cp/lisp_cli.c
@@
-148,8
+148,8
@@
lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input,
u8 *key = 0;
u32 key_id = 0;
u8 *key = 0;
u32 key_id = 0;
- memset (&eid, 0, sizeof (eid));
- memset (a, 0, sizeof (*a));
+
clib_
memset (&eid, 0, sizeof (eid));
+
clib_
memset (a, 0, sizeof (*a));
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
@@
-308,8
+308,8
@@
lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
- memset (&eid, 0, sizeof (eid));
- memset (&rloc, 0, sizeof (rloc));
+
clib_
memset (&eid, 0, sizeof (eid));
+
clib_
memset (&rloc, 0, sizeof (rloc));
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
@@
-384,7
+384,7
@@
lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
if (!is_add)
{
vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
if (!is_add)
{
vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
- memset (a, 0, sizeof (a[0]));
+
clib_
memset (a, 0, sizeof (a[0]));
gid_address_copy (&a->reid, &eid);
if (vnet_lisp_add_del_adjacency (a))
{
gid_address_copy (&a->reid, &eid);
if (vnet_lisp_add_del_adjacency (a))
{
@@
-398,7
+398,7
@@
lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
if (is_add)
{
vnet_lisp_add_del_mapping_args_t _map_args, *map_args = &_map_args;
if (is_add)
{
vnet_lisp_add_del_mapping_args_t _map_args, *map_args = &_map_args;
- memset (map_args, 0, sizeof (map_args[0]));
+
clib_
memset (map_args, 0, sizeof (map_args[0]));
gid_address_copy (&map_args->eid, &eid);
map_args->action = action;
map_args->is_static = 1;
gid_address_copy (&map_args->eid, &eid);
map_args->action = action;
map_args->is_static = 1;
@@
-449,8
+449,8
@@
lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
- memset (&reid, 0, sizeof (reid));
- memset (&leid, 0, sizeof (leid));
+
clib_
memset (&reid, 0, sizeof (reid));
+
clib_
memset (&leid, 0, sizeof (leid));
leid_ippref = &gid_address_ippref (&leid);
reid_ippref = &gid_address_ippref (&reid);
leid_ippref = &gid_address_ippref (&leid);
reid_ippref = &gid_address_ippref (&reid);
@@
-510,7
+510,7
@@
lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
goto done;
}
goto done;
}
- memset (a, 0, sizeof (a[0]));
+
clib_
memset (a, 0, sizeof (a[0]));
gid_address_copy (&a->leid, &leid);
gid_address_copy (&a->reid, &reid);
a->is_add = is_add;
gid_address_copy (&a->leid, &leid);
gid_address_copy (&a->reid, &reid);
a->is_add = is_add;
@@
-705,11
+705,11
@@
lisp_show_pitr_command_fn (vlib_main_t * vm,
mapping_t *m;
locator_set_t *ls;
u8 *tmp_str = 0;
mapping_t *m;
locator_set_t *ls;
u8 *tmp_str = 0;
+ u8 status = lcm->flags & LISP_FLAG_PITR_MODE;
- vlib_cli_output (vm, "%=20s%=16s",
- "pitr", lcm->lisp_pitr ? "locator-set" : "");
+ vlib_cli_output (vm, "%=20s%=16s", "pitr", status ? "locator-set" : "");
- if (!
lcm->lisp_pitr
)
+ if (!
status
)
{
vlib_cli_output (vm, "%=20s", "disable");
return 0;
{
vlib_cli_output (vm, "%=20s", "disable");
return 0;
@@
-811,7
+811,7
@@
lisp_show_eid_table_command_fn (vlib_main_t * vm,
u8 filter = 0;
clib_error_t *error = NULL;
u8 filter = 0;
clib_error_t *error = NULL;
- memset (&eid, 0, sizeof (eid));
+
clib_
memset (&eid, 0, sizeof (eid));
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
@@
-834,7
+834,7
@@
lisp_show_eid_table_command_fn (vlib_main_t * vm,
}
vlib_cli_output (vm, "%-35s%-20s%-30s%-20s%-s",
}
vlib_cli_output (vm, "%-35s%-20s%-30s%-20s%-s",
- "EID", "type", "locators", "ttl", "autoritative");
+ "EID", "type", "locators", "ttl", "aut
h
oritative");
if (print_all)
{
if (print_all)
{
@@
-902,7
+902,7
@@
lisp_enable_disable_command_fn (vlib_main_t * vm, unformat_input_t * input,
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
- return
0
;
+ return
clib_error_return (0, "expected enable | disable")
;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
@@
-955,7
+955,7
@@
lisp_map_register_enable_disable_command_fn (vlib_main_t * vm,
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
- return
0
;
+ return
clib_error_return (0, "expected enable | disable")
;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
@@
-1008,7
+1008,7
@@
lisp_rloc_probe_enable_disable_command_fn (vlib_main_t * vm,
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
- return
0
;
+ return
clib_error_return (0, "expected enable | disable")
;
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
@@
-1158,8
+1158,8
@@
lisp_add_del_locator_set_command_fn (vlib_main_t * vm,
u32 ls_index = 0;
int rv = 0;
u32 ls_index = 0;
int rv = 0;
- memset (&locator, 0, sizeof (locator));
- memset (a, 0, sizeof (a[0]));
+
clib_
memset (&locator, 0, sizeof (locator));
+
clib_
memset (a, 0, sizeof (a[0]));
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
@@
-1232,8
+1232,8
@@
lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm,
vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
u32 ls_index = 0;
vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
u32 ls_index = 0;
- memset (&locator, 0, sizeof (locator));
- memset (a, 0, sizeof (a[0]));
+
clib_
memset (&locator, 0, sizeof (locator));
+
clib_
memset (a, 0, sizeof (a[0]));
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))
/* Get a line of input. */
if (!unformat_user (input, unformat_line_input, line_input))