From 751bb131ef504b64fe82f393df21dba95ca92e97 Mon Sep 17 00:00:00 2001
From: Matthew Smith <mgsmith@netgate.com>
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 <mgsmith@netgate.com>
---
 src/vnet/ipsec/ipsec.api | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

(limited to 'src/vnet/ipsec/ipsec.api')

diff --git a/src/vnet/ipsec/ipsec.api b/src/vnet/ipsec/ipsec.api
index 8d4580a2c28..c009d8dffaa 100644
--- a/src/vnet/ipsec/ipsec.api
+++ b/src/vnet/ipsec/ipsec.api
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-option version = "5.0.1";
+option version = "5.0.0";
 
 import "vnet/ipsec/ipsec_types.api";
 import "vnet/interface_types.api";
@@ -191,7 +191,6 @@ define ipsec_spd_details {
  */
 define ipsec_sad_entry_add_del
 {
-  option deprecated;
   u32 client_index;
   u32 context;
   bool is_add;
@@ -204,17 +203,8 @@ define ipsec_sad_entry_add_del_v2
   bool is_add;
   vl_api_ipsec_sad_entry_v2_t entry;
 };
-define ipsec_sad_entry_add_del_v3
-{
-  u32 client_index;
-  u32 context;
-  bool is_add;
-  vl_api_ipsec_sad_entry_v3_t entry;
-};
-
 define ipsec_sad_entry_add_del_reply
 {
-  option deprecated;
   u32 context;
   i32 retval;
   u32 stat_index;
@@ -225,12 +215,6 @@ define ipsec_sad_entry_add_del_v2_reply
   i32 retval;
   u32 stat_index;
 };
-define ipsec_sad_entry_add_del_v3_reply
-{
-  u32 context;
-  i32 retval;
-  u32 stat_index;
-};
 
 /** \brief Add or Update Protection for a tunnel with IPSEC
 
@@ -394,7 +378,6 @@ define ipsec_itf_details
 */
 define ipsec_sa_dump
 {
-  option deprecated;
   u32 client_index;
   u32 context;
   u32 sa_id;
@@ -405,12 +388,6 @@ define ipsec_sa_v2_dump
   u32 context;
   u32 sa_id;
 };
-define ipsec_sa_v3_dump
-{
-  u32 client_index;
-  u32 context;
-  u32 sa_id;
-};
 
 /** \brief IPsec security association database response
     @param context - sender context which was passed in the request
@@ -425,7 +402,6 @@ define ipsec_sa_v3_dump
     @param stat_index - index for the SA in the stats segment @ /net/ipsec/sa
 */
 define ipsec_sa_details {
-  option deprecated;
   u32 context;
   vl_api_ipsec_sad_entry_t entry;
 
@@ -449,17 +425,6 @@ define ipsec_sa_v2_details {
 
   u32 stat_index;
 };
-define ipsec_sa_v3_details {
-  u32 context;
-  vl_api_ipsec_sad_entry_v3_t entry;
-
-  vl_api_interface_index_t sw_if_index;
-  u64 seq_outbound;
-  u64 last_seq_inbound;
-  u64 replay_window;
-
-  u32 stat_index;
-};
 
 /** \brief Dump IPsec backends
     @param client_index - opaque cookie to identify the sender
-- 
cgit 1.2.3-korg