Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ip: IP address and prefix types (moved from LISP)
[vpp.git]
/
src
/
vnet
/
lisp-cp
/
one_cli.c
diff --git
a/src/vnet/lisp-cp/one_cli.c
b/src/vnet/lisp-cp/one_cli.c
index
a11138f
..
d5a0ee0
100644
(file)
--- a/
src/vnet/lisp-cp/one_cli.c
+++ b/
src/vnet/lisp-cp/one_cli.c
@@
-144,8
+144,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))
@@
-178,6
+178,8
@@
lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input,
}
locator_set_index = p[0];
}
}
locator_set_index = p[0];
}
+ else if (unformat (line_input, "authoritative"))
+ a->authoritative = 1;
else
{
error = unformat_parse_error (line_input);
else
{
error = unformat_parse_error (line_input);
@@
-290,9
+292,9
@@
lisp_add_del_ndp_entry_command_fn (vlib_main_t * vm,
u32 hw_addr_set = 0, ip_set = 0, is_add = 1;
gid_address_t _g, *g = &_g;
u32 hw_addr_set = 0, ip_set = 0, is_add = 1;
gid_address_t _g, *g = &_g;
- memset (&ip6, 0, sizeof (ip6));
- memset (hw_addr, 0, sizeof (hw_addr));
- memset (g, 0, sizeof (*g));
+
clib_
memset (&ip6, 0, sizeof (ip6));
+
clib_
memset (hw_addr, 0, sizeof (hw_addr));
+
clib_
memset (g, 0, sizeof (*g));
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
@@
-321,7
+323,7
@@
lisp_add_del_ndp_entry_command_fn (vlib_main_t * vm,
}
/* build GID address */
}
/* build GID address */
- ip_address_set (&gid_address_arp_ndp_ip (g), &ip6, IP6);
+ ip_address_set (&gid_address_arp_ndp_ip (g), &ip6,
AF_
IP6);
gid_address_ndp_bd (g) = bd;
gid_address_type (g) = GID_ADDR_NDP;
rc = vnet_lisp_add_del_l2_arp_ndp_entry (g, hw_addr, is_add);
gid_address_ndp_bd (g) = bd;
gid_address_type (g) = GID_ADDR_NDP;
rc = vnet_lisp_add_del_l2_arp_ndp_entry (g, hw_addr, is_add);
@@
-354,9
+356,9
@@
lisp_add_del_l2_arp_entry_command_fn (vlib_main_t * vm,
u32 hw_addr_set = 0, ip_set = 0, is_add = 1;
gid_address_t _arp, *arp = &_arp;
u32 hw_addr_set = 0, ip_set = 0, is_add = 1;
gid_address_t _arp, *arp = &_arp;
- memset (&ip4, 0, sizeof (ip4));
- memset (hw_addr, 0, sizeof (hw_addr));
- memset (arp, 0, sizeof (*arp));
+
clib_
memset (&ip4, 0, sizeof (ip4));
+
clib_
memset (hw_addr, 0, sizeof (hw_addr));
+
clib_
memset (arp, 0, sizeof (*arp));
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
@@
-503,8
+505,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)
{
@@
-577,7
+579,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))
{
@@
-591,7
+593,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;
@@
-645,8
+647,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);
@@
-706,7
+708,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;
@@
-1127,7
+1129,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))
@@
-1700,8
+1702,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))
@@
-1719,6
+1721,7
@@
lisp_add_del_locator_set_command_fn (vlib_main_t * vm,
&locator.weight))
{
locator.local = 1;
&locator.weight))
{
locator.local = 1;
+ locator.state = 1;
vec_add1 (locators, locator);
}
else
vec_add1 (locators, locator);
}
else
@@
-1774,8
+1777,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))