X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibapi%2Fapi_types.h;h=8cd47bb770f33a261a04b7746d17f725ef58d665;hb=1bc96680c45237e6ed519e4be36738139a94af2d;hp=8a86612f0fb804aa72621e3a6b3df81442c6e58e;hpb=d6e9aecfd67ebfd012873eb24b72221f13e8f089;p=vpp.git

diff --git a/src/vlibapi/api_types.h b/src/vlibapi/api_types.h
index 8a86612f0fb..8cd47bb770f 100644
--- a/src/vlibapi/api_types.h
+++ b/src/vlibapi/api_types.h
@@ -20,7 +20,16 @@
 #ifndef included_api_types_h
 #define included_api_types_h
 
+#include <stdbool.h>
+#include <stdarg.h>
 #include <vppinfra/types.h>
+#include <arpa/inet.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
 /* VPP API string type */
 typedef struct
@@ -29,31 +38,15 @@ typedef struct
   u8 buf[0];
 } __attribute__ ((packed)) vl_api_string_t;
 
-static inline int
-vl_api_to_api_string (u32 len, const char *buf, vl_api_string_t * str)
-{
-  clib_memcpy(str->buf, buf, len);
-  str->length = clib_host_to_net_u32 (len);
-  return len + sizeof (u32);
-}
+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);
+extern u8 *vl_api_format_string (u8 *s, va_list *args);
 
-/* 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 clib_net_to_host_u32 (astr->length);
-}
-
-static inline char *
-vl_api_from_api_string_c (vl_api_string_t *astr)
-{
-  return strndup((char *)astr->buf, clib_net_to_host_u32(astr->length));
+#ifdef __cplusplus
 }
+#endif
 
 #endif