aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/acl/manual_fns.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/acl/manual_fns.h')
-rw-r--r--src/plugins/acl/manual_fns.h31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/plugins/acl/manual_fns.h b/src/plugins/acl/manual_fns.h
index 700fb682cb8..f9f42c5fa36 100644
--- a/src/plugins/acl/manual_fns.h
+++ b/src/plugins/acl/manual_fns.h
@@ -18,7 +18,6 @@
#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>
@@ -129,18 +128,19 @@ 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->src_prefix.address.af ? "ipv6" : "ipv4");
+ s = format (0, " %s ", a->is_ipv6 ? "ipv6" : "ipv4");
s = format_acl_action (s, a->is_permit);
s = format (s, " \\\n");
- s = format (s, " src %U dst %U \\\n",
- format_fib_prefix, &src,
- format_fib_prefix, &dst);
+ 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, " 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),
@@ -158,19 +158,20 @@ 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->src_prefix.address.af ? "ipv6" : "ipv4",
+ s = format (0, " %s %s \\\n", a->is_ipv6 ? "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);
- s = format (s, " src ip %U, \\",
- format_fib_prefix, &src);
+ 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);
PRINT_S;
return handle;