diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-11-18 10:57:22 +0200 | 
|---|---|---|
| committer | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-11-18 11:35:31 +0200 | 
| commit | e46a4ac958dc14e4db64c90b71a458e68042811d (patch) | |
| tree | ccffe8fa993aabec40ab667b0fc12333386b51e9 /lib/nexthop_group.c | |
| parent | 19fee2b7eba7034e0c0b60b8956e40a294792770 (diff) | |
lib: Replace inet_ntop to %pI4/6 for JSON outputs
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
Diffstat (limited to 'lib/nexthop_group.c')
| -rw-r--r-- | lib/nexthop_group.c | 16 | 
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c index af9cd2d79a..774d03079a 100644 --- a/lib/nexthop_group.c +++ b/lib/nexthop_group.c @@ -1046,26 +1046,18 @@ void nexthop_group_json_nexthop(json_object *j, const struct nexthop *nh)  				       ifindex2ifname(nh->ifindex, nh->vrf_id));  		break;  	case NEXTHOP_TYPE_IPV4: -		json_object_string_add( -			j, "nexthop", -			inet_ntop(AF_INET, &nh->gate.ipv4, buf, sizeof(buf))); +		json_object_string_addf(j, "nexthop", "%pI4", &nh->gate.ipv4);  		break;  	case NEXTHOP_TYPE_IPV4_IFINDEX: -		json_object_string_add( -			j, "nexthop", -			inet_ntop(AF_INET, &nh->gate.ipv4, buf, sizeof(buf))); +		json_object_string_addf(j, "nexthop", "%pI4", &nh->gate.ipv4);  		json_object_string_add(j, "vrfId",  				       ifindex2ifname(nh->ifindex, nh->vrf_id));  		break;  	case NEXTHOP_TYPE_IPV6: -		json_object_string_add( -			j, "nexthop", -			inet_ntop(AF_INET6, &nh->gate.ipv6, buf, sizeof(buf))); +		json_object_string_addf(j, "nexthop", "%pI6", &nh->gate.ipv6);  		break;  	case NEXTHOP_TYPE_IPV6_IFINDEX: -		json_object_string_add( -			j, "nexthop", -			inet_ntop(AF_INET6, &nh->gate.ipv6, buf, sizeof(buf))); +		json_object_string_addf(j, "nexthop", "%pI6", &nh->gate.ipv6);  		json_object_string_add(j, "vrfId",  				       ifindex2ifname(nh->ifindex, nh->vrf_id));  		break;  | 
