From 6aaee8c7cd356bb8603963889a4a08700a736551 Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Fri, 6 Dec 2019 13:37:51 +0100
Subject: [PATCH] ikev2: use explicit api types

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I2171ef678ecad12d681668257498a5a62004152f
---
 src/plugins/ikev2/ikev2.api    | 35 +++++++++++++++++++----------------
 src/plugins/ikev2/ikev2_api.c  |  1 +
 src/plugins/ikev2/ikev2_test.c |  1 +
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/plugins/ikev2/ikev2.api b/src/plugins/ikev2/ikev2.api
index 8c9649f6cb3..29d0c7bfc0b 100644
--- a/src/plugins/ikev2/ikev2.api
+++ b/src/plugins/ikev2/ikev2.api
@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-option version = "1.0.0";
+option version = "1.0.1";
+
+import "vnet/ip/ip_types.api";
+import "vnet/interface_types.api";
 
 /** \brief Get the plugin version
     @param client_index - opaque cookie to identify the sender
@@ -50,8 +53,8 @@ autoreply define ikev2_profile_add_del
   u32 client_index;
   u32 context;
 
-  u8 name[64];
-  u8 is_add;
+  string name[64];
+  bool is_add;
   option vat_help = "name <profile_name> [del]";
 };
 
@@ -70,9 +73,9 @@ autoreply define ikev2_profile_set_auth
   u32 client_index;
   u32 context;
 
-  u8 name[64];
+  string name[64];
   u8 auth_method;
-  u8 is_hex;
+  bool is_hex;
   u32 data_len;
   u8 data[data_len];
   option vat_help = "name <profile_name> auth_method <method> (auth_data 0x<data> | auth_data <data>)";
@@ -93,8 +96,8 @@ autoreply define ikev2_profile_set_id
   u32 client_index;
   u32 context;
 
-  u8 name[64];
-  u8 is_local;
+  string name[64];
+  bool is_local;
   u8 id_type;
   u32 data_len;
   u8 data[data_len];
@@ -118,8 +121,8 @@ autoreply define ikev2_profile_set_ts
   u32 client_index;
   u32 context;
 
-  u8 name[64];
-  u8 is_local;
+  string name[64];
+  bool is_local;
   u8 proto;
   u16 start_port;
   u16 end_port;
@@ -156,9 +159,9 @@ autoreply define ikev2_set_responder
   u32 client_index;
   u32 context;
 
-  u8 name[64];
-  u32 sw_if_index;
-  u8 address[4];
+  string name[64];
+  vl_api_interface_index_t sw_if_index;
+  vl_api_ip4_address_t address;
   option vat_help = "<profile_name> interface <interface> address <addr>";
 };
 
@@ -178,7 +181,7 @@ autoreply define ikev2_set_ike_transforms
   u32 client_index;
   u32 context;
 
-  u8 name[64];
+  string name[64];
   u32 crypto_alg;
   u32 crypto_key_size;
   u32 integ_alg;
@@ -202,7 +205,7 @@ autoreply define ikev2_set_esp_transforms
   u32 client_index;
   u32 context;
 
-  u8 name[64];
+  string name[64];
   u32 crypto_alg;
   u32 crypto_key_size;
   u32 integ_alg;
@@ -226,7 +229,7 @@ autoreply define ikev2_set_sa_lifetime
   u32 client_index;
   u32 context;
 
-  u8 name[64];
+  string name[64];
   u64 lifetime;
   u32 lifetime_jitter;
   u32 handover;
@@ -246,7 +249,7 @@ autoreply define ikev2_initiate_sa_init
   u32 client_index;
   u32 context;
 
-  u8 name[64];
+  string name[64];
   option vat_help = "<profile_name>";
 };
 
diff --git a/src/plugins/ikev2/ikev2_api.c b/src/plugins/ikev2/ikev2_api.c
index 741cceca71e..365e6e8932f 100644
--- a/src/plugins/ikev2/ikev2_api.c
+++ b/src/plugins/ikev2/ikev2_api.c
@@ -26,6 +26,7 @@
 #include <ikev2/ikev2_priv.h>
 
 /* define message IDs */
+#include <vnet/format_fns.h>
 #include <plugins/ikev2/ikev2.api_enum.h>
 #include <plugins/ikev2/ikev2.api_types.h>
 
diff --git a/src/plugins/ikev2/ikev2_test.c b/src/plugins/ikev2/ikev2_test.c
index c740d478240..69d223f0c48 100644
--- a/src/plugins/ikev2/ikev2_test.c
+++ b/src/plugins/ikev2/ikev2_test.c
@@ -27,6 +27,7 @@
 #include <vlibapi/vat_helper_macros.h>
 
 /* Declare message IDs */
+#include <vnet/format_fns.h>
 #include <ikev2/ikev2.api_enum.h>
 #include <ikev2/ikev2.api_types.h>
 
-- 
2.16.6