- restore fib paths support for ip4
- initialize payload_proto to the relevant default protocol so that
'via <dev>' paths are supported
- fix 'rx all'
- fix temp path vector mem leak
Type: fix
Change-Id: I564d88dc4dce86884ff6791af69974e6d70ff7ca
Signed-off-by: Benoît Ganne <bganne@cisco.com>
vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
- ip46_address_t nh = { 0 };
+ fib_route_path_t *rpaths = NULL, rpath;
+ dpo_proto_t payload_proto = DPO_PROTO_IP4;
clib_error_t *error = 0;
u32 rx_sw_if_index = ~0;
clib_error_t *error = 0;
u32 rx_sw_if_index = ~0;
- u32 tx_sw_if_index = ~0;
vnet_main_t *vnm;
u8 is_add;
vnet_main_t *vnm;
u8 is_add;
else if (unformat (line_input, "add"))
is_add = 1;
else if (unformat (line_input, "rx all"))
else if (unformat (line_input, "add"))
is_add = 1;
else if (unformat (line_input, "rx all"))
else if (unformat (line_input, "rx %U",
unformat_vnet_sw_interface, vnm, &rx_sw_if_index))
;
else if (unformat (line_input, "rx %U",
unformat_vnet_sw_interface, vnm, &rx_sw_if_index))
;
- else if (unformat (line_input, "via %U %U",
- unformat_ip4_address, &nh.ip4,
- unformat_vnet_sw_interface, vnm, &tx_sw_if_index))
- ;
- else if (unformat (line_input, "via %U",
- unformat_vnet_sw_interface, vnm, &tx_sw_if_index))
- ;
+ else if (unformat (line_input, "via %U", unformat_fib_route_path, &rpath,
+ &payload_proto))
+ vec_add1 (rpaths, rpath);
else
{
error = unformat_parse_error (line_input);
else
{
error = unformat_parse_error (line_input);
- ip4_punt_redirect_add (rx_sw_if_index, tx_sw_if_index, &nh);
+ if (vec_len (rpaths))
+ ip4_punt_redirect_add_paths (rx_sw_if_index, rpaths);
unformat_free (line_input);
return (error);
}
unformat_free (line_input);
return (error);
}
{
unformat_input_t _line_input, *line_input = &_line_input;
fib_route_path_t *rpaths = NULL, rpath;
{
unformat_input_t _line_input, *line_input = &_line_input;
fib_route_path_t *rpaths = NULL, rpath;
- dpo_proto_t payload_proto;
+ dpo_proto_t payload_proto = DPO_PROTO_IP6;
clib_error_t *error = 0;
u32 rx_sw_if_index = ~0;
vnet_main_t *vnm;
clib_error_t *error = 0;
u32 rx_sw_if_index = ~0;
vnet_main_t *vnm;
else if (unformat (line_input, "add"))
is_add = 1;
else if (unformat (line_input, "rx all"))
else if (unformat (line_input, "add"))
is_add = 1;
else if (unformat (line_input, "rx all"))
else if (unformat (line_input, "rx %U",
unformat_vnet_sw_interface, vnm, &rx_sw_if_index))
;
else if (unformat (line_input, "rx %U",
unformat_vnet_sw_interface, vnm, &rx_sw_if_index))
;
unformat_free (line_input);
return (error);
}
unformat_free (line_input);
return (error);
}