misc: strcpy be gone

[vpp.git] / src / vpp / api / types.c

diff --git a/src/vpp/api/types.c b/src/vpp/api/types.c
index f9993b1..a30736f 100644 (file)
--- a/src/vpp/api/types.c
+++ b/src/vpp/api/types.c
@@ -25,9 +25,9 @@ const vl_api_address_t VL_API_ZERO_ADDRESS;
 u8 *
 format_vl_api_address_family (u8 * s, va_list * args)
 {
-  vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t);
+  vl_api_address_family_t af = va_arg (*args, int);
 
-  if (ADDRESS_IP6 == clib_net_to_host_u32 (af))
+  if (ADDRESS_IP6 == af)
       s = format (s, "ip4");
   else
       s = format (s, "ip6");
@@ -40,7 +40,7 @@ format_vl_api_address (u8 * s, va_list * args)
 {
   const vl_api_address_t *addr = va_arg (*args, vl_api_address_t *);
 
-  if (ADDRESS_IP6 == clib_net_to_host_u32 (addr->af))
+  if (ADDRESS_IP6 == addr->af)
     s = format (s, "%U", format_ip6_address, addr->un.ip6);
   else
     s = format (s, "%U", format_ip4_address, addr->un.ip4);
@@ -53,7 +53,7 @@ format_vl_api_address_union (u8 * s, va_list * args)
 {
   const vl_api_address_union_t *addr =
     va_arg (*args, vl_api_address_union_t *);
-  vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t);
+  vl_api_address_family_t af = va_arg (*args, int);
 
   if (ADDRESS_IP6 == af)
     s = format (s, "%U", format_ip6_address, addr->ip6);
@@ -102,6 +102,20 @@ format_vl_api_mac_address (u8 * s, va_list * args)
   return (format (s, "%U", format_ethernet_address, mac));
 }
 
+u8 *
+format_vl_api_version (u8 * s, va_list * args)
+{
+  vl_api_version_t *ver = va_arg (*args, vl_api_version_t *);
+  s = format(s, "%d.%d.%d", ver->major, ver->minor, ver->patch);
+  if (ver->pre_release[0] != 0)
+  {
+    s = format(s, "-%v", ver->pre_release);
+    if (ver->build_metadata[0] != 0)
+    s = format(s, "+%v", ver->build_metadata);
+    }
+  return s;
+}
+
 uword
 unformat_vl_api_mac_address (unformat_input_t * input, va_list * args)
 {
@@ -116,9 +130,9 @@ unformat_vl_api_address (unformat_input_t * input, va_list * args)
   vl_api_address_t *ip = va_arg (*args, vl_api_address_t *);
 
   if (unformat (input, "%U", unformat_ip4_address, &ip->un.ip4))
-      ip->af = clib_host_to_net_u32(ADDRESS_IP4);
+      ip->af = ADDRESS_IP4;
   else if (unformat (input, "%U", unformat_ip6_address, &ip->un.ip6))
-      ip->af = clib_host_to_net_u32(ADDRESS_IP6);
+      ip->af = ADDRESS_IP6;
   else
       return (0);
 
@@ -132,9 +146,9 @@ unformat_vl_api_address_family (unformat_input_t * input,
   vl_api_address_family_t *af = va_arg (*args, vl_api_address_family_t *);
 
   if (unformat (input, "ip4") || unformat (input, "ipv4"))
-      *af = clib_host_to_net_u32(ADDRESS_IP4);
+      *af = ADDRESS_IP4;
   else if (unformat (input, "ip6") || unformat (input, "ipv6"))
-      *af = clib_host_to_net_u32(ADDRESS_IP6);
+      *af = ADDRESS_IP6;
   else
       return (0);
 
@@ -219,3 +233,19 @@ unformat_vl_api_mprefix (unformat_input_t * input, va_list * args)
    return (1);
 }
 
+uword unformat_vl_api_version (unformat_input_t * input, va_list * args)
+{
+vl_api_version_t *ver = va_arg (*args, vl_api_version_t *);
+
+if (unformat (input, "%d.%d.%d-%s+%s",  ver->major, ver->minor, ver->patch, ver->pre_release, ver->build_metadata
+                ))
+      return (1);
+else if (unformat (input, "%d.%d.%d-%s",  ver->major, ver->minor, ver->patch, ver->pre_release
+                ))
+      return (1);
+else if (unformat (input, "%d.%d.%d",  ver->major, ver->minor, ver->patch
+                ))
+      return (1);
+
+  return (0);
+}