From: Neale Ranns <nranns@cisco.com>
Date: Mon, 6 Apr 2020 07:37:47 +0000 (+0000)
Subject: acl: fix unresolved symbol for format_fib_prefix in vat plugin
X-Git-Tag: v20.09-rc0~250
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=f18f09b16b02f3b136be0794a3de5f9ef6e6f651

acl: fix unresolved symbol for format_fib_prefix in vat plugin

Type: fix

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

diff --git a/src/plugins/acl/manual_fns.h b/src/plugins/acl/manual_fns.h
index 700fb682cb8..f2585a9985d 100644
--- a/src/plugins/acl/manual_fns.h
+++ b/src/plugins/acl/manual_fns.h
@@ -129,18 +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_t src, dst;
 
-  ip_prefix_decode (&a->src_prefix, &src);
-  ip_prefix_decode (&a->dst_prefix, &dst);
+  ip_prefix_decode2 (&a->src_prefix, &src);
+  ip_prefix_decode2 (&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");
 
   s = format (s, "    src %U dst %U \\\n",
-              format_fib_prefix, &src,
-              format_fib_prefix, &dst);
+              format_ip_prefix, &src,
+              format_ip_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,9 +158,9 @@ 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_t src;
 
-  ip_prefix_decode (&a->src_prefix, &src);
+  ip_prefix_decode2 (&a->src_prefix, &src);
 
   s = format (0, "  %s %s \\\n", a->src_prefix.address.af ? "ipv6" : "ipv4",
               a->is_permit ? "permit" : "deny");
@@ -170,7 +170,7 @@ vl_api_macip_acl_rule_t_print (vl_api_macip_acl_rule_t * a, void *handle)
 	      format_ethernet_address, a->src_mac_mask);
 
   s = format (s, "    src ip %U, \\",
-		format_fib_prefix, &src);
+		format_ip_prefix, &src);
 
   PRINT_S;
   return handle;