From 59ff918ea5b86112ffc89054aa38107703354585 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Sun, 29 Dec 2019 23:55:18 +0000 Subject: tunnel: Common types for IP tunnels Type: refactor Signed-off-by: Neale Ranns Change-Id: I18dcdb7af3e327f6cacdbcb1e52b89f13d6ba6e2 --- src/vnet/ipsec/ipsec_api.c | 3 ++- src/vnet/ipsec/ipsec_cli.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/vnet/ipsec') diff --git a/src/vnet/ipsec/ipsec_api.c b/src/vnet/ipsec/ipsec_api.c index 4252acd2688..87f59313e55 100644 --- a/src/vnet/ipsec/ipsec_api.c +++ b/src/vnet/ipsec/ipsec_api.c @@ -646,7 +646,8 @@ vl_api_ipsec_tunnel_if_add_del_t_handler (vl_api_ipsec_tunnel_if_add_del_t * (mp->renumber ? ntohl (mp->show_instance) : ~0), &local_ip, &remote_ip, fib_index, - IPIP_TUNNEL_FLAG_NONE, IP_DSCP_CS0, &sw_if_index); + TUNNEL_ENCAP_DECAP_FLAG_NONE, IP_DSCP_CS0, + &sw_if_index); if (rv) goto done; diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c index e4121605fdc..f04ccc8dc8a 100644 --- a/src/vnet/ipsec/ipsec_cli.c +++ b/src/vnet/ipsec/ipsec_cli.c @@ -842,7 +842,8 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm, rv = ipip_add_tunnel (ipv6_set ? IPIP_TRANSPORT_IP6 : IPIP_TRANSPORT_IP4, instance, &local_ip, &remote_ip, fib_index, - IPIP_TUNNEL_FLAG_NONE, IP_DSCP_CS0, &sw_if_index); + TUNNEL_ENCAP_DECAP_FLAG_NONE, IP_DSCP_CS0, + &sw_if_index); rv |= ipsec_sa_add_and_lock (ipsec_tun_mk_local_sa_id (sw_if_index), local_spi, IPSEC_PROTOCOL_ESP, crypto_alg, -- cgit 1.2.3-korg