acl: API cleanup

[vpp.git] / src / plugins / acl / manual_fns.h

diff --git a/src/plugins/acl/manual_fns.h b/src/plugins/acl/manual_fns.h
index 6ab014c..700fb68 100644 (file)
--- a/src/plugins/acl/manual_fns.h
+++ b/src/plugins/acl/manual_fns.h
@@ -18,6 +18,11 @@
 
 #include <vnet/ip/format.h>
 #include <vnet/ethernet/ethernet.h>
+#include <vnet/ip/ip_types_api.h>
+
+#define vl_endianfun            /* define message structures */
+#include <acl/acl_types.api.h>
+#undef vl_endianfun
 
 /* Macro to finish up custom dump fns */
 #define PRINT_S \
@@ -124,19 +129,18 @@ static inline void *
 vl_api_acl_rule_t_print (vl_api_acl_rule_t * a, void *handle)
 {
   u8 *s;
+  fib_prefix_t src, dst;
+
+  ip_prefix_decode (&a->src_prefix, &src);
+  ip_prefix_decode (&a->dst_prefix, &dst);
 
-  s = format (0, "  %s ", a->is_ipv6 ? "ipv6" : "ipv4");
+  s = format (0, "  %s ", a->src_prefix.address.af ? "ipv6" : "ipv4");
   s = format_acl_action (s, a->is_permit);
   s = format (s, " \\\n");
 
-  if (a->is_ipv6)
-    s = format (s, "    src %U/%d dst %U/%d \\\n",
-               format_ip6_address, a->src_ip_addr, a->src_ip_prefix_len,
-               format_ip6_address, a->dst_ip_addr, a->dst_ip_prefix_len);
-  else
-    s = format (s, "    src %U/%d dst %U/%d \\\n",
-               format_ip4_address, a->src_ip_addr, a->src_ip_prefix_len,
-               format_ip4_address, a->dst_ip_addr, a->dst_ip_prefix_len);
+  s = format (s, "    src %U dst %U \\\n",
+              format_fib_prefix, &src,
+              format_fib_prefix, &dst);
   s = format (s, "    proto %d \\\n", a->proto);
   s = format (s, "    sport %d-%d dport %d-%d \\\n",
              clib_net_to_host_u16 (a->srcport_or_icmptype_first),
@@ -150,26 +154,23 @@ vl_api_acl_rule_t_print (vl_api_acl_rule_t * a, void *handle)
   return handle;
 }
 
-
-
 static inline void *
 vl_api_macip_acl_rule_t_print (vl_api_macip_acl_rule_t * a, void *handle)
 {
   u8 *s;
+  fib_prefix_t src;
+
+  ip_prefix_decode (&a->src_prefix, &src);
 
-  s = format (0, "  %s %s \\\n", a->is_ipv6 ? "ipv6" : "ipv4",
+  s = format (0, "  %s %s \\\n", a->src_prefix.address.af ? "ipv6" : "ipv4",
               a->is_permit ? "permit" : "deny");
 
   s = format (s, "    src mac %U mask %U \\\n",
              format_ethernet_address, a->src_mac,
              format_ethernet_address, a->src_mac_mask);
 
-  if (a->is_ipv6)
-    s = format (s, "    src ip %U/%d, \\",
-               format_ip6_address, a->src_ip_addr, a->src_ip_prefix_len);
-  else
-    s = format (s, "    src ip %U/%d, \\",
-               format_ip4_address, a->src_ip_addr, a->src_ip_prefix_len);
+  s = format (s, "    src ip %U, \\",
+               format_fib_prefix, &src);
 
   PRINT_S;
   return handle;
@@ -227,7 +228,7 @@ vl_api_acl_details_t_print (vl_api_acl_details_t * a, void *handle)
   u32 count = clib_net_to_host_u32 (a->count);
   if (count > 0x100000)
     {
-      s = format (s, "WARN: acl_defails count endianness wrong? Fixup to avoid long loop.\n");
+      s = format (s, "WARN: acl_details count endianness wrong? Fixup to avoid long loop.\n");
       count = a->count;
     }
 
@@ -256,7 +257,7 @@ vl_api_macip_acl_details_t_print (vl_api_macip_acl_details_t * a,
   u32 count = clib_net_to_host_u32 (a->count);
   if (count > 0x100000)
     {
-      s = format (s, "WARN: macip_acl_defails count endianness wrong? Fixup to avoid long loop.\n");
+      s = format (s, "WARN: macip_acl_details count endianness wrong? Fixup to avoid long loop.\n");
       count = a->count;
     }