Use IP and MAC API types for neighbors

use address_t and mac_address_t for IPv6 and ARP entries
and all other API calls in ip.api aprat from the route ones,
that will follow in a separate commit

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

1 files changed, 55 insertions, 4 deletions

diff --git a/src/vpp/api/types.c b/src/vpp/api/types.c
index 0a48711c611..e36b8dd6781 100644
--- a/src/vpp/api/types.c
+++ b/src/vpp/api/types.c
@@ -48,6 +48,26 @@ format_vl_api_address_union (u8 * s, va_list * args)
 }
 
 u8 *
+format_vl_api_ip4_address (u8 * s, va_list * args)
+{
+  const vl_api_ip4_address_t *addr = va_arg (*args, vl_api_ip4_address_t *);
+
+  s = format (s, "%U", format_ip4_address, addr);
+
+  return s;
+}
+
+u8 *
+format_vl_api_ip6_address (u8 * s, va_list * args)
+{
+  const vl_api_ip6_address_t *addr = va_arg (*args, vl_api_ip6_address_t *);
+
+  s = format (s, "%U", format_ip6_address, addr);
+
+  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 *);
@@ -58,6 +78,14 @@ format_vl_api_prefix (u8 * s, va_list * args)
   return s;
 }
 
+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));
+}
+
 uword
 unformat_vl_api_mac_address (unformat_input_t * input, va_list * args)
 {
@@ -81,11 +109,34 @@ unformat_vl_api_address (unformat_input_t * input, va_list * args)
   return (1);
 }
 
-u8 *
-format_vl_api_mac_address (u8 * s, va_list * args)
+uword
+unformat_vl_api_ip4_address (unformat_input_t * input, va_list * args)
 {
-  vl_api_mac_address_t *mac = va_arg (*args, vl_api_mac_address_t *);
+  vl_api_ip4_address_t *ip = va_arg (*args, vl_api_ip4_address_t *);
 
-  return (format (s, "%U", format_ethernet_address, mac));
+  if (unformat (input, "%U", unformat_ip4_address, ip))
+      return (1);
+  return (0);
+}
+
+uword
+unformat_vl_api_ip6_address (unformat_input_t * input, va_list * args)
+{
+  vl_api_ip6_address_t *ip = va_arg (*args, vl_api_ip6_address_t *);
+
+  if (unformat (input, "%U", unformat_ip6_address, ip))
+      return (1);
+  return (0);
+}
+
+uword
+unformat_vl_api_prefix (unformat_input_t * input, va_list * args)
+{
+   vl_api_prefix_t *pfx = va_arg (*args, vl_api_prefix_t *);
+
+  if (unformat (input, "%U/%d", unformat_vl_api_address, &pfx->address,
+                &pfx->address_length))
+      return (1);
+  return (0);
 }