Skip to content

linux-cp: fix interface ipip parser in xfrm-nl plugin #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
like-a-bus wants to merge 1 commit into from
Closed

linux-cp: fix interface ipip parser in xfrm-nl plugin #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/plugins/linux-cp/lcp_xfrm_nl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,6 @@ static clib_error_t *
lcp_xfrm_itf_pair_config (vlib_main_t *vm, unformat_input_t *input)
{
u32 buf_size, batch_size, batch_delay_ms;
char *tunnel_name = NULL;

while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
{
Expand All @@ -542,13 +541,10 @@ lcp_xfrm_itf_pair_config (vlib_main_t *vm, unformat_input_t *input)
lcp_xfrm_nl_set_batch_size (batch_size);
else if (unformat (input, "nl-batch-delay-ms %u", &batch_delay_ms))
lcp_xfrm_nl_set_batch_delay (batch_delay_ms);
else if (unformat (input, "interface %s", tunnel_name))
{
if (!clib_strcmp (tunnel_name, "ipsec"))
nm->interface_type = NL_INTERFACE_TYPE_IPSEC;

vec_free (tunnel_name);
}
else if (unformat (input, "interface ipsec"))
nm->interface_type = NL_INTERFACE_TYPE_IPSEC;
else if (unformat (input, "interface ipip"))
nm->interface_type = NL_INTERFACE_TYPE_IPIP;
else
return clib_error_return (0, "invalid netlink option: %U",
format_unformat_error, input);
Expand Down
Loading