ipip: refactor ipip.api with explicit types

Use explicit types vl_api_address/prefix in ipip.api.

Change-Id: Ib3133cebdbe4437742924efd49cde4009c4cc31b
Type: refactor
Signed-off-by: Ole Troan <ot@cisco.com>

3 files changed, 17 insertions, 24 deletions

diff --git a/src/tools/vppapigen/vppapigen_c.py b/src/tools/vppapigen/vppapigen_c.py
index 6c4ca356f3a..b34d063c340 100644
--- a/src/tools/vppapigen/vppapigen_c.py
+++ b/src/tools/vppapigen/vppapigen_c.py
@@ -13,6 +13,7 @@ top_boilerplate = '''\
  * Automatically generated: please edit the input file NOT this file!
  */
 
+#include <stdbool.h>
 #if defined(vl_msg_id)||defined(vl_union_id) \\
     || defined(vl_printfun) ||defined(vl_endianfun) \\
     || defined(vl_api_version)||defined(vl_typedefs) \\
diff --git a/src/vnet/ipip/ipip.api b/src/vnet/ipip/ipip.api
index e8051fde7f8..8a6e726eba4 100644
--- a/src/vnet/ipip/ipip.api
+++ b/src/vnet/ipip/ipip.api
@@ -1,4 +1,3 @@
-/* Hey Emacs use -*- mode: C -*- */
 /*
  * Copyright (c) 2018 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,13 +57,14 @@ import "vnet/ip/ip_types.api";
  */
 typedef ipip_tunnel
 {
-  u32 instance;		/* If non-~0, specifies a custom dev instance */
+  u32 instance; /* If non-~0, specifies a custom dev instance */
   vl_api_address_t src;
   vl_api_address_t dst;
-  u32 sw_if_index; /* ignored on create, set in details/dump */
-u32 table_id;
-  u8 tc_tos;		/* If ~0, the TOS/TC value is copied from
-			   inner packet, otherwise set to value */
+  vl_api_interface_index_t sw_if_index; /* ignored on create, set in
+					   details/dump */
+  u32 table_id;
+  u8 tc_tos; /* If ~0, the TOS/TC value is copied from
+                inner packet, otherwise set to value */
 };
 
 /**
@@ -103,14 +103,12 @@ define ipip_6rd_add_tunnel
   u32 context;
   u32 ip6_table_id;
   u32 ip4_table_id;
-  u8 ip6_prefix[16];
-  u8 ip4_prefix[4];
-  u8 ip4_src[4];
-  u8 ip6_prefix_len;
-  u8 ip4_prefix_len;
-  u8 security_check;
-  u8 tc_tos;		/* If ~0, the TOS/TC value is copied from
-			   inner packet, otherwise set to value */
+  vl_api_ip6_prefix_t ip6_prefix;
+  vl_api_ip4_prefix_t ip4_prefix;
+  vl_api_ip4_address_t ip4_src;
+  bool security_check;
+  u8 tc_tos; /* If ~0, the TOS/TC value is copied from
+                inner packet, otherwise set to value */
 };
 
 define ipip_6rd_add_tunnel_reply
@@ -145,9 +143,3 @@ define ipip_tunnel_details
   u32 context;
   vl_api_ipip_tunnel_t tunnel;
 };
-
-/*
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/src/vnet/ipip/ipip_api.c b/src/vnet/ipip/ipip_api.c
index f97aaf78bd4..35b846e5c8b 100644
--- a/src/vnet/ipip/ipip_api.c
+++ b/src/vnet/ipip/ipip_api.c
@@ -178,10 +178,10 @@ vl_api_ipip_6rd_add_tunnel_t_handler (vl_api_ipip_6rd_add_tunnel_t * mp)
     }
   else
     {
-      rv = sixrd_add_tunnel ((ip6_address_t *) & mp->ip6_prefix,
-			     mp->ip6_prefix_len,
-			     (ip4_address_t *) & mp->ip4_prefix,
-			     mp->ip4_prefix_len,
+      rv = sixrd_add_tunnel ((ip6_address_t *) & mp->ip6_prefix.prefix,
+			     mp->ip6_prefix.len,
+			     (ip4_address_t *) & mp->ip4_prefix.prefix,
+			     mp->ip4_prefix.len,
 			     (ip4_address_t *) & mp->ip4_src,
 			     mp->security_check,
 			     ip4_fib_index, ip6_fib_index,