api: Remove the inlines file and replace with library functions

using inlines exposes the users to the internal data types used by VPP, namely vec.h. This file does not compile with a C++ compiler.

Type: feature

Change-Id: I1544fdd9eae998309f865df61df78571bdb96903
Signed-off-by: Neale Ranns <nranns@cisco.com>

11 files changed, 55 insertions, 67 deletions

diff --git a/src/plugins/http_static/http_static.c b/src/plugins/http_static/http_static.c
index d380665f1e2..2ad4acfb0c1 100644
--- a/src/plugins/http_static/http_static.c
+++ b/src/plugins/http_static/http_static.c
@@ -22,7 +22,6 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 #include <vpp/app/version.h>
-#include <vlibapi/api_types_inlines.h>
 
 /* define message IDs */
 #include <http_static/http_static_msg_enum.h>
diff --git a/src/plugins/http_static/http_static_test.c b/src/plugins/http_static/http_static_test.c
index ec715725148..0720463cf63 100644
--- a/src/plugins/http_static/http_static_test.c
+++ b/src/plugins/http_static/http_static_test.c
@@ -18,7 +18,6 @@
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 #include <vppinfra/error.h>
-#include <vlibapi/api_types_inlines.h>
 
 uword unformat_sw_if_index (unformat_input_t * input, va_list * args);
 
diff --git a/src/plugins/map/map_api.c b/src/plugins/map/map_api.c
index 5619b24c9aa..a64d90cd452 100644
--- a/src/plugins/map/map_api.c
+++ b/src/plugins/map/map_api.c
@@ -22,7 +22,6 @@
 #include <vnet/ip/ip.h>
 #include <vnet/fib/fib_table.h>
 #include <vlibmemory/api.h>
-#include <vlibapi/api_types_inlines.h>
 
 #define vl_typedefs		/* define message structures */
 #include <map/map_all_api_h.h>
diff --git a/src/plugins/nat/nat_api.c b/src/plugins/nat/nat_api.c
index 7c1445f90c8..1dad4e42728 100644
--- a/src/plugins/nat/nat_api.c
+++ b/src/plugins/nat/nat_api.c
@@ -32,7 +32,6 @@
 #include <nat/nat_msg_enum.h>
 #include <vnet/fib/fib_table.h>
 #include <vnet/ip/ip_types_api.h>
-#include <vlibapi/api_types_inlines.h>
 
 #define vl_api_nat44_lb_addr_port_t_endian vl_noop_handler
 #define vl_api_nat44_add_del_lb_static_mapping_t_endian vl_noop_handler
diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index 3c0b0f9570a..992060df394 100644
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -58,7 +58,6 @@
 #include "vat/json_format.h"
 #include <vnet/ip/ip_types_api.h>
 #include <vnet/ethernet/ethernet_types_api.h>
-#include <vlibapi/api_types_inlines.h>
 
 #include <inttypes.h>
 #include <sys/stat.h>
diff --git a/src/vlibapi/api_shared.c b/src/vlibapi/api_shared.c
index 5b45b24ffb5..a9e037c8365 100644
--- a/src/vlibapi/api_shared.c
+++ b/src/vlibapi/api_shared.c
@@ -992,6 +992,46 @@ vl_msg_pop_heap (void *oldheap)
   pthread_mutex_unlock (&am->vlib_rp->mutex);
 }
 
+int
+vl_api_to_api_string (u32 len, const char *buf, vl_api_string_t * str)
+{
+  clib_memcpy_fast (str->buf, buf, len);
+  str->length = htonl (len);
+  return len + sizeof (u32);
+}
+
+int
+vl_api_vec_to_api_string (const u8 * vec, vl_api_string_t * str)
+{
+  u32 len = vec_len (vec);
+  clib_memcpy (str->buf, vec, len);
+  str->length = htonl (len);
+  return len + sizeof (u32);
+}
+
+/* Return a pointer to the API string (not nul terminated */
+u8 *
+vl_api_from_api_string (vl_api_string_t * astr)
+{
+  return astr->buf;
+}
+
+u32
+vl_api_string_len (vl_api_string_t * astr)
+{
+  return ntohl (astr->length);
+}
+
+/*
+ * Returns a new vector. Remember to free it after use.
+ */
+u8 *
+vl_api_from_api_to_vec (vl_api_string_t * astr)
+{
+  u8 *v = 0;
+  vec_add (v, astr->buf, ntohl (astr->length));
+  return v;
+}
 
 /*
  * fd.io coding-style-patch-verification: ON
diff --git a/src/vlibapi/api_types.h b/src/vlibapi/api_types.h
index 0289a417c79..b0efa6177bd 100644
--- a/src/vlibapi/api_types.h
+++ b/src/vlibapi/api_types.h
@@ -24,6 +24,11 @@
 #include <arpa/inet.h>
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /* VPP API string type */
 typedef struct
 {
@@ -31,4 +36,14 @@ typedef struct
   u8 buf[0];
 } __attribute__ ((packed)) vl_api_string_t;
 
+extern int vl_api_to_api_string (u32 len, const char *buf, vl_api_string_t * str);
+extern int vl_api_vec_to_api_string (const u8 *vec, vl_api_string_t * str);
+extern u8 * vl_api_from_api_string (vl_api_string_t * astr);
+extern u32 vl_api_string_len (vl_api_string_t * astr);
+extern u8 * vl_api_from_api_to_vec (vl_api_string_t *astr);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/vlibapi/api_types_inlines.h b/src/vlibapi/api_types_inlines.h
deleted file mode 100644
index a26d91b5558..00000000000
--- a/src/vlibapi/api_types_inlines.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *------------------------------------------------------------------
- * api_types.h
- *
- * Copyright (c) 2018 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-static inline int
-vl_api_to_api_string (u32 len, const char *buf, vl_api_string_t * str)
-{
-  clib_memcpy_fast(str->buf, buf, len);
-  str->length = htonl (len);
-  return len + sizeof (u32);
-}
-
-static inline int
-vl_api_vec_to_api_string (const u8 *vec, vl_api_string_t * str)
-{
-  u32 len = vec_len(vec);
-  clib_memcpy(str->buf, vec, len);
-  str->length = htonl (len);
-  return len + sizeof (u32);
-}
-
-/* Return a pointer to the API string (not nul terminated */
-static inline u8 *
-vl_api_from_api_string (vl_api_string_t * astr)
-{
-  return astr->buf;
-}
-
-static inline u32
-vl_api_string_len (vl_api_string_t * astr)
-{
-  return ntohl (astr->length);
-}
-
-/*
- * Returns a new vector. Remember to free it after use.
- */
-static inline u8 *
-vl_api_from_api_to_vec (vl_api_string_t *astr)
-{
-  u8 *v = 0;
-  vec_add(v, astr->buf, ntohl(astr->length));
-  return v;
-}
diff --git a/src/vnet/ip/punt_api.c b/src/vnet/ip/punt_api.c
index 946a0010a0c..b356886a56f 100644
--- a/src/vnet/ip/punt_api.c
+++ b/src/vnet/ip/punt_api.c
@@ -21,7 +21,6 @@
 #include <vlibmemory/api.h>
 #include <vnet/ip/punt.h>
 #include <vnet/ip/ip_types_api.h>
-#include <vlibapi/api_types_inlines.h>
 
 #include <vnet/vnet_msg_enum.h>
 
diff --git a/src/vpp/api/api.c b/src/vpp/api/api.c
index 9c2381189a2..c21d562d8f3 100644
--- a/src/vpp/api/api.c
+++ b/src/vpp/api/api.c
@@ -60,7 +60,6 @@
 
 #include <vpp/api/vpe_msg_enum.h>
 #include <vpp/api/types.h>
-#include <vlibapi/api_types_inlines.h>
 
 #define vl_typedefs		/* define message structures */
 #include <vpp/api/vpe_all_api_h.h>
diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index 4d118255986..95f02677068 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -50,7 +50,6 @@
 
 #include <vpp/api/vpe_msg_enum.h>
 #include <vpp/api/types.h>
-#include <vlibapi/api_types_inlines.h>
 
 #include <vnet/bonding/node.h>