Genric API types format/unformat support for VAT and custom dump

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

3 files changed, 128 insertions, 0 deletions

diff --git a/src/vpp/CMakeLists.txt b/src/vpp/CMakeLists.txt
index 16843f73e8a..98e98e5d7ae 100644
--- a/src/vpp/CMakeLists.txt
+++ b/src/vpp/CMakeLists.txt
@@ -61,6 +61,7 @@ set(VPP_SOURCES
   api/api.c
   api/json_format.c
   api/custom_dump.c
+  api/types.c
 )
 
 if(VPP_API_TEST_BUILTIN)
@@ -68,6 +69,7 @@ if(VPP_API_TEST_BUILTIN)
     api/api_format.c
     api/api_main.c
     api/plugin.c
+    api/types.c
   )
   add_definitions(-DVPP_API_TEST_BUILTIN=1)
 endif()
diff --git a/src/vpp/api/types.c b/src/vpp/api/types.c
new file mode 100644
index 00000000000..b1f16564c59
--- /dev/null
+++ b/src/vpp/api/types.c
@@ -0,0 +1,91 @@
+/*
+ *------------------------------------------------------------------
+ * 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.
+ *------------------------------------------------------------------
+ */
+
+#include <vlib/vlib.h>
+#include <vpp/api/types.h>
+#include <vat/vat.h>
+
+u8 *
+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))
+    s = format (s, "ip6:%U", format_ip6_address, addr->un.ip6.address);
+  else
+    s = format (s, "ip4:%U", format_ip4_address, addr->un.ip4.address);
+
+  return s;
+}
+
+u8 *
+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);
+
+  if (ADDRESS_IP6 == af)
+    s = format (s, "ip6:%U", format_ip6_address, addr->ip6.address);
+  else
+    s = format (s, "ip4:%U", format_ip4_address, addr->ip4.address);
+
+  return s;
+}
+
+u8 *
+format_vl_api_prefix (u8 * s, va_list * args)
+{
+  const vl_api_prefix_t *pfx = va_arg (*args, vl_api_prefix_t *);
+
+  s = format (s, "%U/%d", format_vl_api_address,
+	      &pfx->address, pfx->address_length);
+
+  return s;
+}
+
+uword
+unformat_vl_api_mac_address (unformat_input_t * input, va_list * args)
+{
+  vl_api_mac_address_t *mac = va_arg (*args, vl_api_mac_address_t *);
+
+  return (unformat (input, "%U",unformat_ethernet_address, mac->bytes));
+}
+
+uword
+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);
+  else if (unformat (input, "%U", unformat_ip6_address, &ip->un.ip6))
+      ip->af = clib_host_to_net_u32(ADDRESS_IP6);
+  else
+      return (0);
+
+  return (1);
+}
+
+u8 *
+format_vl_api_mac_address (u8 * s, va_list * args)
+{
+  vl_api_mac_address_t *mac = va_arg (*args, vl_api_mac_address_t *);
+
+  return (format (s, "%U", format_ethernet_address, mac->bytes));
+}
+
diff --git a/src/vpp/api/types.h b/src/vpp/api/types.h
new file mode 100644
index 00000000000..252caa2d626
--- /dev/null
+++ b/src/vpp/api/types.h
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#ifndef __API_TYPES_H__
+#define __API_TYPES_H__
+
+#define vl_typedefs		/* define message structures */
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_typedefs
+
+const vl_api_mac_address_t VL_API_ZERO_MAC_ADDRESS;
+const vl_api_address_t VL_API_ZERO_ADDRESS;
+
+extern uword unformat_vl_api_mac_address (unformat_input_t * input, va_list * args);
+extern uword unformat_vl_api_address (unformat_input_t * input, va_list * args);
+
+extern u8 *format_vl_api_address (u8 * s, va_list * args);
+extern u8 *format_vl_api_address_union (u8 * s, va_list * args);
+extern u8 *format_vl_api_prefix (u8 * s, va_list * args);
+extern u8 *format_vl_api_mprefix (u8 * s, va_list * args);
+extern u8 *format_vl_api_mac_address (u8 * s, va_list * args);
+
+#endif