From: Steve Shin <jonshin@cisco.com>
Date: Fri, 13 Oct 2017 20:13:02 +0000 (-0700)
Subject: acl-plugin: display "::" for INADDR6_ANY on ACL output
X-Git-Tag: v18.04-rc0~471
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=69cce166535e138e66d0a95f1cfe6a3591489e10

acl-plugin: display "::" for INADDR6_ANY on ACL output

INADDR6_ANY should be displayed as "::" instead of "0.0.0.0"(ipv4 format).

Change-Id: I24ec7b6febbfeca5db7ff894f455ecb73d954334
Signed-off-by: Steve Shin <jonshin@cisco.com>
---

diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c
index 7af5e9d369e..b9a4ab27134 100644
--- a/src/plugins/acl/acl.c
+++ b/src/plugins/acl/acl.c
@@ -2164,7 +2164,8 @@ my_macip_acl_rule_t_pretty_format (u8 *out, va_list *args)
 
   out = format(out, "%s action %d ip %U/%d mac %U mask %U",
                      a->is_ipv6 ? "ipv6" : "ipv4", a->is_permit,
-                     format_ip46_address, &a->src_ip_addr, IP46_TYPE_ANY,
+                     format_ip46_address, &a->src_ip_addr,
+                     a->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4,
                      a->src_prefixlen,
                      my_format_mac_address, a->src_mac,
                      my_format_mac_address, a->src_mac_mask);
@@ -2232,8 +2233,10 @@ u8 *acl_format_acl(u8 *out0, acl_main_t *am, int acl_index)
     r = &am->acls[acl_index].rules[j];
     out0 = format(out0, "  %4d: %s ", j, r->is_ipv6 ? "ipv6" : "ipv4");
     out0 = format_acl_action(out0, r->is_permit);
-    out0 = format(out0, " src %U/%d", format_ip46_address, &r->src, IP46_TYPE_ANY, r->src_prefixlen);
-    out0 = format(out0, " dst %U/%d", format_ip46_address, &r->dst, IP46_TYPE_ANY, r->dst_prefixlen);
+    out0 = format(out0, " src %U/%d", format_ip46_address, &r->src,
+                  r->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4, r->src_prefixlen);
+    out0 = format(out0, " dst %U/%d", format_ip46_address, &r->dst,
+                  r->is_ipv6 ? IP46_TYPE_IP6: IP46_TYPE_IP4, r->dst_prefixlen);
     out0 = format(out0, " proto %d", r->proto);
     out0 = format(out0, " sport %d", r->src_port_or_type_first);
     if (r->src_port_or_type_first != r->src_port_or_type_last) {
diff --git a/src/plugins/acl/fa_node.c b/src/plugins/acl/fa_node.c
index a4ba967d7dd..a7e7b056a0b 100644
--- a/src/plugins/acl/fa_node.c
+++ b/src/plugins/acl/fa_node.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",