diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2020-10-14 19:16:23 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2020-10-17 19:39:10 +0200 |
| commit | e0259674e3fb9fea513ae68ace393b43a2c7b1b9 (patch) | |
| tree | 7a6fcbf3dc2e36b678d9637d4164f4bb09ac7b59 /ripngd/ripngd.c | |
| parent | lib: Convert usage of strings to %pFX and %pRN (diff) | |
| download | frr-e0259674e3fb9fea513ae68ace393b43a2c7b1b9.tar.xz frr-e0259674e3fb9fea513ae68ace393b43a2c7b1b9.zip | |
ripngd: Convert to using %pFX
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ripngd/ripngd.c')
| -rw-r--r-- | ripngd/ripngd.c | 51 |
1 files changed, 20 insertions, 31 deletions
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c index c2eb7c6ee..060477010 100644 --- a/ripngd/ripngd.c +++ b/ripngd/ripngd.c @@ -643,8 +643,7 @@ static int ripng_filter(int ripng_distribute, struct prefix_ipv6 *p, (struct prefix *)p) == FILTER_DENY) { if (IS_RIPNG_DEBUG_PACKET) - zlog_debug("%s/%d filtered by distribute %s", - inet6_ntoa(p->prefix), p->prefixlen, + zlog_debug("%pFX filtered by distribute %s", p, inout); return -1; } @@ -654,8 +653,7 @@ static int ripng_filter(int ripng_distribute, struct prefix_ipv6 *p, (struct prefix *)p) == PREFIX_DENY) { if (IS_RIPNG_DEBUG_PACKET) - zlog_debug("%s/%d filtered by prefix-list %s", - inet6_ntoa(p->prefix), p->prefixlen, + zlog_debug("%pFX filtered by prefix-list %s", p, inout); return -1; } @@ -673,9 +671,8 @@ static int ripng_filter(int ripng_distribute, struct prefix_ipv6 *p, == FILTER_DENY) { if (IS_RIPNG_DEBUG_PACKET) zlog_debug( - "%s/%d filtered by distribute %s", - inet6_ntoa(p->prefix), - p->prefixlen, inout); + "%pFX filtered by distribute %s", + p, inout); return -1; } } @@ -689,9 +686,8 @@ static int ripng_filter(int ripng_distribute, struct prefix_ipv6 *p, == PREFIX_DENY) { if (IS_RIPNG_DEBUG_PACKET) zlog_debug( - "%s/%d filtered by prefix-list %s", - inet6_ntoa(p->prefix), - p->prefixlen, inout); + "%pFX filtered by prefix-list %s", + p, inout); return -1; } } @@ -997,14 +993,12 @@ void ripng_redistribute_add(struct ripng *ripng, int type, int sub_type, if (IS_RIPNG_DEBUG_EVENT) { if (!nexthop) zlog_debug( - "Redistribute new prefix %s/%d on the interface %s", - inet6_ntoa(p->prefix), p->prefixlen, - ifindex2ifname(ifindex, ripng->vrf->vrf_id)); + "Redistribute new prefix %pFX on the interface %s", + p, ifindex2ifname(ifindex, ripng->vrf->vrf_id)); else zlog_debug( - "Redistribute new prefix %s/%d with nexthop %s on the interface %s", - inet6_ntoa(p->prefix), p->prefixlen, - inet6_ntoa(*nexthop), + "Redistribute new prefix %pFX with nexthop %s on the interface %s", + p, inet6_ntoa(*nexthop), ifindex2ifname(ifindex, ripng->vrf->vrf_id)); } @@ -1047,9 +1041,8 @@ void ripng_redistribute_delete(struct ripng *ripng, int type, int sub_type, if (IS_RIPNG_DEBUG_EVENT) zlog_debug( - "Poisone %s/%d on the interface %s with an infinity metric [delete]", - inet6_ntoa(p->prefix), - p->prefixlen, + "Poisone %pFX on the interface %s with an infinity metric [delete]", + p, ifindex2ifname( ifindex, ripng->vrf->vrf_id)); @@ -1091,9 +1084,8 @@ void ripng_redistribute_withdraw(struct ripng *ripng, int type) agg_node_get_prefix(rp); zlog_debug( - "Poisone %s/%d on the interface %s [withdraw]", - inet6_ntoa(p->prefix), - p->prefixlen, + "Poisone %pFX on the interface %s [withdraw]", + p, ifindex2ifname( rinfo->ifindex, ripng->vrf->vrf_id)); @@ -1680,9 +1672,8 @@ void ripng_output_process(struct interface *ifp, struct sockaddr_in6 *to, if (ret == RMAP_DENYMATCH) { if (IS_RIPNG_DEBUG_PACKET) zlog_debug( - "RIPng %s/%d is filtered by route-map out", - inet6_ntoa(p->prefix), - p->prefixlen); + "RIPng %pFX is filtered by route-map out", + p); continue; } } @@ -1697,9 +1688,8 @@ void ripng_output_process(struct interface *ifp, struct sockaddr_in6 *to, if (ret == RMAP_DENYMATCH) { if (IS_RIPNG_DEBUG_PACKET) zlog_debug( - "RIPng %s/%d is filtered by route-map", - inet6_ntoa(p->prefix), - p->prefixlen); + "RIPng %pFX is filtered by route-map", + p); continue; } } @@ -1795,9 +1785,8 @@ void ripng_output_process(struct interface *ifp, struct sockaddr_in6 *to, if (ret == RMAP_DENYMATCH) { if (IS_RIPNG_DEBUG_PACKET) zlog_debug( - "RIPng %s/%d is filtered by route-map out", - inet6_ntoa(p->prefix), - p->prefixlen); + "RIPng %pFX is filtered by route-map out", + p); continue; } |