From 377860a7394970d339a33717a8c4c8cad328632f Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Fri, 21 Jun 2019 07:57:18 -0700 Subject: 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 --- src/vlibapi/api_shared.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'src/vlibapi/api_shared.c') 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 -- cgit 1.2.3-korg