From 9ec846c2684b69f47505d73ea9f873b793a11558 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 9 Feb 2021 14:04:02 +0000 Subject: ipsec: Use the new tunnel API types to add flow label and TTL copy support Type: feature attmpet 2. this includes changes in ah_encrypt that don't use uninitialised memory when doing tunnel mode fixups. Signed-off-by: Neale Ranns Change-Id: Ie3cb776f5c415c93b8a5ee22f22586fd0181110d --- src/vnet/tunnel/tunnel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/vnet/tunnel') diff --git a/src/vnet/tunnel/tunnel.c b/src/vnet/tunnel/tunnel.c index 1bd03eb4a1a..d45a46205d8 100644 --- a/src/vnet/tunnel/tunnel.c +++ b/src/vnet/tunnel/tunnel.c @@ -174,16 +174,14 @@ unformat_tunnel (unformat_input_t *input, va_list *args) unformat (input, "src %U", unformat_ip_address, &t->t_src); unformat (input, "dst %U", unformat_ip_address, &t->t_dst); - unformat (input, "table-id:%d", &t->t_table_id); - unformat (input, "hop-limit:%d", &t->t_hop_limit); + unformat (input, "table-id %d", &t->t_table_id); + unformat (input, "hop-limit %d", &t->t_hop_limit); unformat (input, "%U", unformat_ip_dscp, &t->t_dscp); unformat (input, "%U", unformat_tunnel_encap_decap_flags, &t->t_encap_decap_flags); unformat (input, "%U", unformat_tunnel_flags, &t->t_flags); unformat (input, "%U", unformat_tunnel_mode, &t->t_mode); - ASSERT (!"Check not 4 and 6"); - return (1); } -- cgit 1.2.3-korg