X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_format_fns.h;h=810a866dc549198b2f0de2e6e16c71cc7db468ea;hb=dc20371f83ed81462c0b24eb750b76f7819df64a;hp=b24c59454d4536567f2716f4971cbdab0b6e16e9;hpb=33a58171e5995d9e649b414bfc77f2aab26e4c58;p=vpp.git

diff --git a/src/vnet/ip/ip_format_fns.h b/src/vnet/ip/ip_format_fns.h
index b24c59454d4..810a866dc54 100644
--- a/src/vnet/ip/ip_format_fns.h
+++ b/src/vnet/ip/ip_format_fns.h
@@ -20,8 +20,7 @@ static inline u8 *format_vl_api_ip6_address_t (u8 * s, va_list * args);
 static inline u8 *format_vl_api_ip4_address_t (u8 * s, va_list * args);
 
 #include <vnet/ip/format.h>
-#define vl_typedefs
-#include <vnet/ip/ip_types.api.h>
+#include <vnet/ip/ip_types.api_types.h>
 
 static inline u8 *
 format_vl_api_ip6_address_t (u8 * s, va_list * args)
@@ -65,13 +64,13 @@ format_vl_api_address_t (u8 * s, va_list * args)
   vl_api_address_t *a = va_arg (*args, vl_api_address_t *);
   u32 indent __attribute__((unused)) = va_arg (*args, u32);
 
-  switch (a->af)  {
+  switch (clib_host_to_net_u32 (a->af))  {
   case ADDRESS_IP4:
     return format(s, "%U", format_ip4_address, &a->un.ip4);
   case ADDRESS_IP6:
     return format(s, "%U", format_ip6_address, &a->un.ip6);
     }
-  return format (s, "");
+  return format (s, "unknown-af");
 }
 
 static inline u8 *
@@ -83,4 +82,22 @@ format_vl_api_prefix_t (u8 * s, va_list * args)
   return format (s, "%U/%u", format_vl_api_address_t, &a->address, indent, a->len);
 }
 
+static inline u8 *
+format_vl_api_address_with_prefix_t (u8 * s, va_list * args)
+{
+  return format_vl_api_prefix_t (s, args);
+}
+
+static inline u8 *
+format_vl_api_ip4_address_with_prefix_t (u8 * s, va_list * args)
+{
+        return format_vl_api_ip4_prefix_t (s, args);
+}
+
+static inline u8 *
+format_vl_api_ip6_address_with_prefix_t (u8 * s, va_list * args)
+{
+        return format_vl_api_ip6_prefix_t (s, args);
+}
+
 #endif