commit 9ec846c2684b69f47505d73ea9f873b793a11558
author Neale Ranns <neale@graphiant.com> Tue Feb 09 14:04:02 2021 +0000
committer Matthew Smith <mgsmith@netgate.com> Wed Feb 10 13:39:37 2021 +0000
tree 78b1f3ced7dcee5d925f5c715b7e2ba99d5cdd95
parent 98d82ca04ba438cd2ba3c03de6e1e82e4786cd83

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 <neale@graphiant.com>
Change-Id: Ie3cb776f5c415c93b8a5ee22f22586fd0181110d

src/vnet/tunnel/tunnel.c

diff --git a/src/vnet/tunnel/tunnel.c b/src/vnet/tunnel/tunnel.c
index 1bd03eb..d45a462 100644
--- a/src/vnet/tunnel/tunnel.c
+++ b/src/vnet/tunnel/tunnel.c
@@ -174,16 +174,14 @@
 
   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);
 }