Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BD ARP entry use common API types
[vpp.git]
/
src
/
vnet
/
l2
/
l2_xcrw.c
diff --git
a/src/vnet/l2/l2_xcrw.c
b/src/vnet/l2/l2_xcrw.c
index
70610a8
..
b7ccd81
100644
(file)
--- a/
src/vnet/l2/l2_xcrw.c
+++ b/
src/vnet/l2/l2_xcrw.c
@@
-306,7
+306,7
@@
create_xcrw_interface (vlib_main_t * vm)
u32 sw_if_index;
/* mac address doesn't really matter */
u32 sw_if_index;
/* mac address doesn't really matter */
- memset (address, 0, sizeof (address));
+
clib_
memset (address, 0, sizeof (address));
address[2] = 0x12;
/* can returns error iff phy != 0 */
address[2] = 0x12;
/* can returns error iff phy != 0 */
@@
-352,7
+352,7
@@
vnet_configure_l2_xcrw (vlib_main_t * vm, vnet_main_t * vnm,
vec_validate (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
vec_validate (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
- memset (a, 0, sizeof (*a));
+
clib_
memset (a, 0, sizeof (*a));
a->rewrite_header.sw_if_index = tx_fib_index;
a->rewrite_header.sw_if_index = tx_fib_index;
@@
-366,8
+366,8
@@
vnet_configure_l2_xcrw (vlib_main_t * vm, vnet_main_t * vnm,
if (vec_len (rewrite))
vnet_rewrite_set_data (a[0], rewrite, vec_len (rewrite));
if (vec_len (rewrite))
vnet_rewrite_set_data (a[0], rewrite, vec_len (rewrite));
- set_int_l2_mode (vm, vnm, MODE_L2_XC, t->l2_sw_if_index, 0,
0, 0,
- t->tunnel_sw_if_index);
+ set_int_l2_mode (vm, vnm, MODE_L2_XC, t->l2_sw_if_index, 0,
+
L2_BD_PORT_TYPE_NORMAL, 0,
t->tunnel_sw_if_index);
hash_set (xcm->tunnel_index_by_l2_sw_if_index,
t->l2_sw_if_index, t - xcm->tunnels);
return 0;
hash_set (xcm->tunnel_index_by_l2_sw_if_index,
t->l2_sw_if_index, t - xcm->tunnels);
return 0;
@@
-382,9
+382,10
@@
vnet_configure_l2_xcrw (vlib_main_t * vm, vnet_main_t * vnm,
a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
/* Reset adj to drop traffic */
a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
/* Reset adj to drop traffic */
- memset (a, 0, sizeof (*a));
+
clib_
memset (a, 0, sizeof (*a));
- set_int_l2_mode (vm, vnm, MODE_L3, t->l2_sw_if_index, 0, 0, 0, 0);
+ set_int_l2_mode (vm, vnm, MODE_L3, t->l2_sw_if_index, 0,
+ L2_BD_PORT_TYPE_NORMAL, 0, 0);
vnet_sw_interface_set_flags (vnm, t->tunnel_sw_if_index, 0 /* down */ );
vnet_sw_interface_set_flags (vnm, t->tunnel_sw_if_index, 0 /* down */ );
@@
-409,6
+410,7
@@
set_l2_xcrw_command_fn (vlib_main_t * vm,
u8 *rw = 0;
vnet_main_t *vnm = vnet_get_main ();
int rv;
u8 *rw = 0;
vnet_main_t *vnm = vnet_get_main ();
int rv;
+ clib_error_t *error = NULL;
if (!unformat_user (input, unformat_line_input, line_input))
if (!unformat_user (input, unformat_line_input, line_input))
@@
-416,8
+418,11
@@
set_l2_xcrw_command_fn (vlib_main_t * vm,
if (!unformat (line_input, "%U",
unformat_vnet_sw_interface, vnm, &l2_sw_if_index))
if (!unformat (line_input, "%U",
unformat_vnet_sw_interface, vnm, &l2_sw_if_index))
- return clib_error_return (0, "unknown input '%U'",
- format_unformat_error, line_input);
+ {
+ error = clib_error_return (0, "unknown input '%U'",
+ format_unformat_error, line_input);
+ goto done;
+ }
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
{
@@
-436,7
+441,10
@@
set_l2_xcrw_command_fn (vlib_main_t * vm,
}
if (next_node_index == ~0)
}
if (next_node_index == ~0)
- return clib_error_return (0, "next node not specified");
+ {
+ error = clib_error_return (0, "next node not specified");
+ goto done;
+ }
if (tx_fib_id != ~0)
{
if (tx_fib_id != ~0)
{
@@
-448,7
+456,11
@@
set_l2_xcrw_command_fn (vlib_main_t * vm,
p = hash_get (ip4_main.fib_index_by_table_id, tx_fib_id);
if (p == 0)
p = hash_get (ip4_main.fib_index_by_table_id, tx_fib_id);
if (p == 0)
- return clib_error_return (0, "nonexistent tx_fib_id %d", tx_fib_id);
+ {
+ error =
+ clib_error_return (0, "nonexistent tx_fib_id %d", tx_fib_id);
+ goto done;
+ }
tx_fib_index = p[0];
}
tx_fib_index = p[0];
}
@@
-463,16
+475,21
@@
set_l2_xcrw_command_fn (vlib_main_t * vm,
break;
case VNET_API_ERROR_INVALID_SW_IF_INDEX:
break;
case VNET_API_ERROR_INVALID_SW_IF_INDEX:
- return clib_error_return (0, "%U not cross-connected",
- format_vnet_sw_if_index_name,
- vnm, l2_sw_if_index);
+ error = clib_error_return (0, "%U not cross-connected",
+ format_vnet_sw_if_index_name,
+ vnm, l2_sw_if_index);
+ goto done;
+
default:
default:
- return clib_error_return (0, "vnet_configure_l2_xcrw returned %d", rv);
+ error = clib_error_return (0, "vnet_configure_l2_xcrw returned %d", rv);
+ goto done;
}
}
+done:
vec_free (rw);
vec_free (rw);
+ unformat_free (line_input);
- return
0
;
+ return
error
;
}
/*?
}
/*?