X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Facl%2Ffa_node.c;h=a7e7b056a0b01d66f2a5b792451df1f166c817f5;hb=69cce166535e138e66d0a95f1cfe6a3591489e10;hp=8d8f1d2eee417d8324c93ad252bb5037bcf4f6d6;hpb=71bb05454c97cc18e3c95127b54385c52e4c57c2;p=vpp.git

diff --git a/src/plugins/acl/fa_node.c b/src/plugins/acl/fa_node.c
index 8d8f1d2eee4..a7e7b056a0b 100644
--- a/src/plugins/acl/fa_node.c
+++ b/src/plugins/acl/fa_node.c
@@ -20,7 +20,7 @@
 #include <vnet/pg/pg.h>
 #include <vppinfra/error.h>
 #include <acl/acl.h>
-#include "bihash_40_8.h"
+#include <vppinfra/bihash_40_8.h>
 
 #include <vppinfra/bihash_template.h>
 #include <vppinfra/bihash_template.c>
@@ -170,7 +170,8 @@ single_acl_match_5tuple (acl_main_t * am, u32 acl_index, fa_5tuple_t * pkt_5tupl
       clib_warning
 	("ACL_FA_NODE_DBG acl %d rule %d pkt dst addr %U match rule addr %U/%d",
 	 acl_index, i, format_ip46_address, &pkt_5tuple->addr[1],
-	 IP46_TYPE_ANY, format_ip46_address, &r->dst, IP46_TYPE_ANY,
+	 r->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4, format_ip46_address,
+         &r->dst, r->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4,
 	 r->dst_prefixlen);
 #endif
 
@@ -182,7 +183,8 @@ single_acl_match_5tuple (acl_main_t * am, u32 acl_index, fa_5tuple_t * pkt_5tupl
       clib_warning
 	("ACL_FA_NODE_DBG acl %d rule %d pkt src addr %U match rule addr %U/%d",
 	 acl_index, i, format_ip46_address, &pkt_5tuple->addr[0],
-	 IP46_TYPE_ANY, format_ip46_address, &r->src, IP46_TYPE_ANY,
+	 r->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4, format_ip46_address,
+         &r->src, r->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4,
 	 r->src_prefixlen);
       clib_warning
 	("ACL_FA_NODE_DBG acl %d rule %d trying to match pkt proto %d with rule %d",