X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvat%2Fapi_format.c;h=bfc9e3cb644b8fc02c2a2950c24c2ee298a6bc9f;hb=1e3aa5e213c23588981ee17d1413a0441a40527a;hp=cef60e05725968c698f55293f955062f5589cbf9;hpb=3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934;p=vpp.git

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index cef60e05725..bfc9e3cb644 100644
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -15028,8 +15028,8 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam)
   u32 crypto_alg = 0, integ_alg = 0;
   u8 *lck = NULL, *rck = NULL;
   u8 *lik = NULL, *rik = NULL;
-  ip4_address_t local_ip = { {0} };
-  ip4_address_t remote_ip = { {0} };
+  vl_api_address_t local_ip = { 0 };
+  vl_api_address_t remote_ip = { 0 };
   u8 is_add = 1;
   u8 esn = 0;
   u8 anti_replay = 0;
@@ -15049,9 +15049,11 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam)
 	;
       else if (unformat (i, "remote_spi %d", &remote_spi))
 	;
-      else if (unformat (i, "local_ip %U", unformat_ip4_address, &local_ip))
+      else
+	if (unformat (i, "local_ip %U", unformat_vl_api_address, &local_ip))
 	;
-      else if (unformat (i, "remote_ip %U", unformat_ip4_address, &remote_ip))
+      else
+	if (unformat (i, "remote_ip %U", unformat_vl_api_address, &remote_ip))
 	;
       else if (unformat (i, "local_crypto_key %U", unformat_hex_string, &lck))
 	;
@@ -15099,8 +15101,8 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam)
   mp->esn = esn;
   mp->anti_replay = anti_replay;
 
-  clib_memcpy (mp->local_ip, &local_ip, sizeof (ip4_address_t));
-  clib_memcpy (mp->remote_ip, &remote_ip, sizeof (ip4_address_t));
+  clib_memcpy (&mp->local_ip, &local_ip, sizeof (local_ip));
+  clib_memcpy (&mp->remote_ip, &remote_ip, sizeof (remote_ip));
 
   mp->local_spi = htonl (local_spi);
   mp->remote_spi = htonl (remote_spi);
@@ -15229,8 +15231,7 @@ static void vl_api_ipsec_sa_details_t_handler_json
 			    ntohl (mp->entry.integrity_algorithm));
   flags = ntohl (mp->entry.flags);
   vat_json_object_add_uint (node, "use_esn",
-			    ! !(flags &
-				IPSEC_API_SAD_FLAG_USE_EXTENDED_SEQ_NUM));
+			    ! !(flags & IPSEC_API_SAD_FLAG_USE_ESN));
   vat_json_object_add_uint (node, "use_anti_replay",
 			    ! !(flags & IPSEC_API_SAD_FLAG_USE_ANTI_REPLAY));
   vat_json_object_add_uint (node, "is_tunnel",