From 2f8cd914514fe54f91974c6d465d4769dfac8de8 Mon Sep 17 00:00:00 2001 From: Jakub Grajciar Date: Fri, 27 Mar 2020 06:55:06 +0100 Subject: acl: API cleanup Use consistent API types. Type: fix Signed-off-by: Jakub Grajciar Change-Id: I09fa6c1b6917936351bd376b56c414ce24488095 Signed-off-by: Jakub Grajciar --- src/plugins/acl/manual_fns.h | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'src/plugins/acl/manual_fns.h') diff --git a/src/plugins/acl/manual_fns.h b/src/plugins/acl/manual_fns.h index f9f42c5fa36..700fb682cb8 100644 --- a/src/plugins/acl/manual_fns.h +++ b/src/plugins/acl/manual_fns.h @@ -18,6 +18,7 @@ #include #include +#include #define vl_endianfun /* define message structures */ #include @@ -128,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; - s = format (0, " %s ", a->is_ipv6 ? "ipv6" : "ipv4"); + 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_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), @@ -158,20 +158,19 @@ 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; -- cgit 1.2.3-korg