From 751bb131ef504b64fe82f393df21dba95ca92e97 Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Mon, 8 Feb 2021 22:13:59 +0000 Subject: Revert "ipsec: Use the new tunnel API types to add flow label and TTL copy" This reverts commit c7eaa711f3e25580687df0618e9ca80d3dc85e5f. Reason for revert: The jenkins job named 'vpp-merge-master-ubuntu1804-x86_64' had 2 IPv6 AH tests fail after the change was merged. Those 2 tests also failed the next time that job ran after an unrelated change was merged. Change-Id: I0e2c3ee895114029066c82624e79807af575b6c0 Signed-off-by: Matthew Smith --- src/vnet/ipsec/ipsec_types.api | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'src/vnet/ipsec/ipsec_types.api') diff --git a/src/vnet/ipsec/ipsec_types.api b/src/vnet/ipsec/ipsec_types.api index b47355908e7..ca1b3788e64 100644 --- a/src/vnet/ipsec/ipsec_types.api +++ b/src/vnet/ipsec/ipsec_types.api @@ -14,7 +14,7 @@ * limitations under the License. */ -option version = "3.0.1"; +option version = "3.0.0"; import "vnet/ip/ip_types.api"; import "vnet/tunnel/tunnel_types.api"; @@ -162,28 +162,6 @@ typedef ipsec_sad_entry_v2 u16 udp_dst_port [default=4500]; }; -typedef ipsec_sad_entry_v3 -{ - u32 sad_id; - u32 spi; - - vl_api_ipsec_proto_t protocol; - - vl_api_ipsec_crypto_alg_t crypto_algorithm; - vl_api_key_t crypto_key; - - vl_api_ipsec_integ_alg_t integrity_algorithm; - vl_api_key_t integrity_key; - - vl_api_ipsec_sad_flags_t flags; - - vl_api_tunnel_t tunnel; - - u32 salt; - u16 udp_src_port [default=4500]; - u16 udp_dst_port [default=4500]; -}; - /* * Local Variables: -- cgit 1.2.3-korg