mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-03 18:42:48 +00:00
bgpd: Replace prefix2str for JSON to %pFX
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
parent
a6c8642429
commit
67d7e256a3
@ -1345,10 +1345,12 @@ static int bgp_show_ethernet_vpn(struct vty *vty, struct prefix_rd *prd,
|
||||
|
||||
json_prefix_info = json_object_new_object();
|
||||
|
||||
json_object_string_add(
|
||||
json_prefix_info, "prefix",
|
||||
prefix2str((struct prefix_evpn *)p, buf,
|
||||
BUFSIZ));
|
||||
prefix2str((struct prefix_evpn *)p, buf,
|
||||
BUFSIZ);
|
||||
|
||||
json_object_string_addf(
|
||||
json_prefix_info, "prefix", "%pFX",
|
||||
(struct prefix_evpn *)p);
|
||||
|
||||
json_object_int_add(json_prefix_info,
|
||||
"prefixLen", p->prefixlen);
|
||||
|
@ -8384,7 +8384,6 @@ static void route_vty_out_route(struct bgp_dest *dest, const struct prefix *p,
|
||||
{
|
||||
int len = 0;
|
||||
char buf[BUFSIZ];
|
||||
char buf2[BUFSIZ];
|
||||
|
||||
if (p->family == AF_INET) {
|
||||
if (!json) {
|
||||
@ -8395,8 +8394,7 @@ static void route_vty_out_route(struct bgp_dest *dest, const struct prefix *p,
|
||||
&p->u.prefix, buf,
|
||||
BUFSIZ));
|
||||
json_object_int_add(json, "prefixLen", p->prefixlen);
|
||||
prefix2str(p, buf2, PREFIX_STRLEN);
|
||||
json_object_string_add(json, "network", buf2);
|
||||
json_object_string_addf(json, "network", "%pFX", p);
|
||||
json_object_int_add(json, "version", dest->version);
|
||||
}
|
||||
} else if (p->family == AF_ETHERNET) {
|
||||
@ -8420,8 +8418,7 @@ static void route_vty_out_route(struct bgp_dest *dest, const struct prefix *p,
|
||||
&p->u.prefix, buf,
|
||||
BUFSIZ));
|
||||
json_object_int_add(json, "prefixLen", p->prefixlen);
|
||||
prefix2str(p, buf2, PREFIX_STRLEN);
|
||||
json_object_string_add(json, "network", buf2);
|
||||
json_object_string_addf(json, "network", "%pFX", p);
|
||||
json_object_int_add(json, "version", dest->version);
|
||||
}
|
||||
}
|
||||
@ -9100,8 +9097,7 @@ void route_vty_out_tmp(struct vty *vty, struct bgp_dest *dest,
|
||||
BUFSIZ));
|
||||
json_object_int_add(json_net, "prefixLen",
|
||||
p->prefixlen);
|
||||
prefix2str(p, buff, PREFIX_STRLEN);
|
||||
json_object_string_add(json_net, "network", buff);
|
||||
json_object_string_addf(json_net, "network", "%pFX", p);
|
||||
}
|
||||
} else
|
||||
route_vty_out_route(dest, p, vty, NULL, wide);
|
||||
@ -11301,8 +11297,7 @@ void route_vty_out_detail_header(struct vty *vty, struct bgp *bgp,
|
||||
dest->version);
|
||||
|
||||
} else {
|
||||
json_object_string_add(json, "prefix",
|
||||
prefix2str(p, prefix_str, sizeof(prefix_str)));
|
||||
json_object_string_addf(json, "prefix", "%pFX", p);
|
||||
json_object_int_add(json, "version", dest->version);
|
||||
|
||||
}
|
||||
|
@ -12363,10 +12363,10 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
|
||||
p->group, &prefix);
|
||||
|
||||
if (range) {
|
||||
prefix2str(range, buf1, sizeof(buf1));
|
||||
json_object_string_add(
|
||||
json_object_string_addf(
|
||||
json_neigh,
|
||||
"peerSubnetRangeGroup", buf1);
|
||||
"peerSubnetRangeGroup", "%pFX",
|
||||
range);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user