diff options
| author |   Steve Shin <jonshin@cisco.com> | 2017-10-13 13:13:02 -0700 |
|---|---|---|
| committer |   John Lo <loj@cisco.com> | 2017-10-13 23:05:37 +0000 |
| commit | 69cce166535e138e66d0a95f1cfe6a3591489e10 (patch) | |
| tree | 1ccf916ce20e519d86c9ad513cf3dc9c3c82591b /src/plugins/acl | |
| parent | bd187a8272762d64f1cbe12da7c82fc86dcbe2bf (diff) | |
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>
Diffstat (limited to 'src/plugins/acl')
| -rw-r--r-- | src/plugins/acl/acl.c | 9 | ||||
| -rw-r--r-- | src/plugins/acl/fa_node.c | 6 |
2 files changed, 10 insertions, 5 deletions
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", |