proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 15:33:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Replace inet_ntop to %pI4/6 for JSON outputs

Browse Source 
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2021-11-18 10:58:09 +02:00
parent ce4b236f61
commit b0d5264e3f
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pimd/pim_cmd.c
View File

@ -313,9 +313,8 @@ static void json_object_pim_ifp_add(struct json_object *json,
pim_ifp = ifp->info; pim_ifp = ifp->info;
json_object_string_add(json, "name", ifp->name); json_object_string_add(json, "name", ifp->name);
json_object_string_add(json, "state", if_is_up(ifp) ? "up" : "down"); json_object_string_add(json, "state", if_is_up(ifp) ? "up" : "down");
json_object_string_add(json, "address", json_object_string_addf(json, "address", "%pI4",
inet_ntop(AF_INET, &pim_ifp->primary_address, &pim_ifp->primary_address);
buf, sizeof(buf)));
json_object_int_add(json, "index", ifp->ifindex); json_object_int_add(json, "index", ifp->ifindex);
if (if_is_multicast(ifp)) if (if_is_multicast(ifp))
@ -537,10 +536,9 @@ static void igmp_show_interfaces(struct pim_instance *pim, struct vty *vty,
"queryTimer", "queryTimer",
query_hhmmss); query_hhmmss);
} }
json_object_string_add( json_object_string_addf(json_row, "querierIp",
json_row, "querierIp", "%pI4",
inet_ntop(AF_INET, &igmp->querier_addr, &igmp->querier_addr);
quer_buf, sizeof(quer_buf)));
json_object_object_add(json, ifp->name, json_object_object_add(json, ifp->name,
json_row); json_row);
@ -669,10 +667,9 @@ static void igmp_show_interfaces_single(struct pim_instance *pim,
igmp->t_igmp_query_timer igmp->t_igmp_query_timer
? "local" ? "local"
: "other"); : "other");
json_object_string_add( json_object_string_addf(json_row, "querierIp",
json_row, "querierIp", "%pI4",
inet_ntop(AF_INET, &igmp->querier_addr, &igmp->querier_addr);
quer_buf, sizeof(quer_buf)));
json_object_int_add(json_row, "queryStartCount", json_object_int_add(json_row, "queryStartCount",
igmp->startup_query_count); igmp->startup_query_count);
json_object_string_add(json_row, json_object_string_add(json_row,
@ -979,11 +976,9 @@ static void pim_show_interfaces_single(struct pim_instance *pim,
json_object_pim_ifp_add(json_row, ifp); json_object_pim_ifp_add(json_row, ifp);
if (pim_ifp->update_source.s_addr != INADDR_ANY) { if (pim_ifp->update_source.s_addr != INADDR_ANY) {
json_object_string_add( json_object_string_addf(
json_row, "useSource", json_row, "useSource", "%pI4",
inet_ntop(AF_INET, &pim_ifp->update_source);
&pim_ifp->update_source,
buf, sizeof(buf)));
} }
if (pim_ifp->sec_addr_list) { if (pim_ifp->sec_addr_list) {
json_object *sec_list = NULL; json_object *sec_list = NULL;
@ -1437,10 +1432,8 @@ static void pim_show_interfaces(struct pim_instance *pim, struct vty *vty,
json_object_int_add(json_row, "pimNeighbors", pim_nbrs); json_object_int_add(json_row, "pimNeighbors", pim_nbrs);
json_object_int_add(json_row, "pimIfChannels", pim_ifchannels); json_object_int_add(json_row, "pimIfChannels", pim_ifchannels);
json_object_int_add(json_row, "firstHopRouterCount", fhr); json_object_int_add(json_row, "firstHopRouterCount", fhr);
json_object_string_add(json_row, "pimDesignatedRouter", json_object_string_addf(json_row, "pimDesignatedRouter", "%pI4",
inet_ntop(AF_INET, &pim_ifp->pim_dr_addr);
&pim_ifp->pim_dr_addr, buf,
sizeof(buf)));
if (pim_ifp->pim_dr_addr.s_addr if (pim_ifp->pim_dr_addr.s_addr
== pim_ifp->primary_address.s_addr) == pim_ifp->primary_address.s_addr)
@ -5715,10 +5708,8 @@ static void show_multicast_interfaces(struct pim_instance *pim, struct vty *vty,
json_object_string_add(json_row, "name", ifp->name); json_object_string_add(json_row, "name", ifp->name);
json_object_string_add(json_row, "state", json_object_string_add(json_row, "state",
if_is_up(ifp) ? "up" : "down"); if_is_up(ifp) ? "up" : "down");
json_object_string_add( json_object_string_addf(json_row, "address", "%pI4",
json_row, "address", &pim_ifp->primary_address);
inet_ntop(AF_INET, &pim_ifp->primary_address,
buf, sizeof(buf)));
json_object_int_add(json_row, "ifIndex", ifp->ifindex); json_object_int_add(json_row, "ifIndex", ifp->ifindex);
json_object_int_add(json_row, "vif", json_object_int_add(json_row, "vif",
pim_ifp->mroute_vif_index); pim_ifp->mroute_vif_index);

9
pimd/pim_rp.c
View File

@ -1228,12 +1228,9 @@ void pim_rp_show_information(struct pim_instance *pim, struct vty *vty, bool uj)
json_rp_rows = json_object_new_array(); json_rp_rows = json_object_new_array();
json_row = json_object_new_object(); json_row = json_object_new_object();
json_object_string_add( json_object_string_addf(
json_row, "rpAddress", json_row, "rpAddress", "%pI4",
inet_ntop(AF_INET, &rp_info->rp.rpf_addr.u.prefix4);
&rp_info->rp.rpf_addr.u
.prefix4,
buf, sizeof(buf)));
if (rp_info->rp.source_nexthop.interface) if (rp_info->rp.source_nexthop.interface)
json_object_string_add( json_object_string_add(
json_row, "outboundInterface", json_row, "outboundInterface",