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

ldpd: 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:57:01 +02:00
parent c949c77101
commit 19fee2b7eb
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ldpd/ldp_vty_exec.c
View File

@ -467,9 +467,8 @@ show_discovery_msg_json(struct imsg *imsg, struct show_params *params,
json_adj = json_object_new_object(); json_adj = json_object_new_object();
json_object_string_add(json_adj, "addressFamily", json_object_string_add(json_adj, "addressFamily",
af_name(adj->af)); af_name(adj->af));
json_object_string_add(json_adj, "neighborId", json_object_string_addf(json_adj, "neighborId", "%pI4",
inet_ntop(AF_INET, &adj->id, buf, &adj->id);
sizeof(buf)));
switch(adj->type) { switch(adj->type) {
case HELLO_LINK: case HELLO_LINK:
json_object_string_add(json_adj, "type", "link"); json_object_string_add(json_adj, "type", "link");
@ -509,8 +508,7 @@ show_discovery_detail_adj_json(json_object *json, struct ctl_adj *adj)
} }
json_adj = json_object_new_object(); json_adj = json_object_new_object();
json_object_string_add(json_adj, "lsrId", inet_ntop(AF_INET, &adj->id, json_object_string_addf(json_adj, "lsrId", "%pI4", &adj->id);
buf, sizeof(buf)));
json_object_string_add(json_adj, "sourceAddress", log_addr(adj->af, json_object_string_add(json_adj, "sourceAddress", log_addr(adj->af,
&adj->src_addr)); &adj->src_addr));
json_object_string_add(json_adj, "transportAddress", log_addr(adj->af, json_object_string_add(json_adj, "transportAddress", log_addr(adj->af,
@ -542,9 +540,7 @@ show_discovery_detail_msg_json(struct imsg *imsg, struct show_params *params,
switch (imsg->hdr.type) { switch (imsg->hdr.type) {
case IMSG_CTL_SHOW_DISCOVERY: case IMSG_CTL_SHOW_DISCOVERY:
rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf); rtr_id.s_addr = ldp_rtr_id_get(ldpd_conf);
json_object_string_add(json, "lsrId", json_object_string_addf(json, "lsrId", "%pI4", &rtr_id);
inet_ntop(AF_INET, &rtr_id, buf,
sizeof(buf)));
if (ldpd_conf->ipv4.flags & F_LDPD_AF_ENABLED) if (ldpd_conf->ipv4.flags & F_LDPD_AF_ENABLED)
json_object_string_add(json, "transportAddressIPv4", json_object_string_add(json, "transportAddressIPv4",
log_addr(AF_INET, &ldpd_conf->ipv4.trans_addr)); log_addr(AF_INET, &ldpd_conf->ipv4.trans_addr));
@ -766,9 +762,8 @@ show_nbr_msg_json(struct imsg *imsg, struct show_params *params,
json_nbr = json_object_new_object(); json_nbr = json_object_new_object();
json_object_string_add(json_nbr, "addressFamily", json_object_string_add(json_nbr, "addressFamily",
af_name(nbr->af)); af_name(nbr->af));
json_object_string_add(json_nbr, "neighborId", json_object_string_addf(json_nbr, "neighborId", "%pI4",
inet_ntop(AF_INET, &nbr->id, buf, &nbr->id);
sizeof(buf)));
json_object_string_add(json_nbr, "state", json_object_string_add(json_nbr, "state",
nbr_state_name(nbr->nbr_state)); nbr_state_name(nbr->nbr_state));
json_object_string_add(json_nbr, "transportAddress", json_object_string_add(json_nbr, "transportAddress",
@ -830,9 +825,7 @@ show_nbr_detail_msg_json(struct imsg *imsg, struct show_params *params,
json_object_object_add(json, json_object_object_add(json,
inet_ntop(AF_INET, &nbr->id, buf, inet_ntop(AF_INET, &nbr->id, buf,
sizeof(buf)), json_nbr); sizeof(buf)), json_nbr);
json_object_string_add(json_nbr, "peerId", json_object_string_addf(json_nbr, "peerId", "%pI4", &nbr->id);
inet_ntop(AF_INET, &nbr->id, buf,
sizeof(buf)));
json_object_string_add(json_nbr, "tcpLocalAddress", json_object_string_add(json_nbr, "tcpLocalAddress",
log_addr(nbr->af, &nbr->laddr)); log_addr(nbr->af, &nbr->laddr));
json_object_int_add(json_nbr, "tcpLocalPort", json_object_int_add(json_nbr, "tcpLocalPort",
@ -1258,9 +1251,8 @@ show_lib_msg_json(struct imsg *imsg, struct show_params *params,
snprintf(dstnet, sizeof(dstnet), "%s/%d", snprintf(dstnet, sizeof(dstnet), "%s/%d",
log_addr(rt->af, &rt->prefix), rt->prefixlen); log_addr(rt->af, &rt->prefix), rt->prefixlen);
json_object_string_add(json_lib_entry, "prefix", dstnet); json_object_string_add(json_lib_entry, "prefix", dstnet);
json_object_string_add(json_lib_entry, "neighborId", json_object_string_addf(json_lib_entry, "neighborId", "%pI4",
inet_ntop(AF_INET, &rt->nexthop, buf, &rt->nexthop);
sizeof(buf)));
json_object_string_add(json_lib_entry, "localLabel", json_object_string_add(json_lib_entry, "localLabel",
log_label(rt->local_label)); log_label(rt->local_label));
json_object_string_add(json_lib_entry, "remoteLabel", json_object_string_add(json_lib_entry, "remoteLabel",
@ -1316,18 +1308,16 @@ show_lib_detail_msg_json(struct imsg *imsg, struct show_params *params,
rt = imsg->data; rt = imsg->data;
json_adv_label = json_object_new_object(); json_adv_label = json_object_new_object();
json_object_string_add(json_adv_label, "neighborId", json_object_string_addf(json_adv_label, "neighborId", "%pI4",
inet_ntop(AF_INET, &rt->nexthop, buf, &rt->nexthop);
sizeof(buf)));
json_object_array_add(json_adv_labels, json_adv_label); json_object_array_add(json_adv_labels, json_adv_label);
break; break;
case IMSG_CTL_SHOW_LIB_RCVD: case IMSG_CTL_SHOW_LIB_RCVD:
rt = imsg->data; rt = imsg->data;
json_remote_label = json_object_new_object(); json_remote_label = json_object_new_object();
json_object_string_add(json_remote_label, "neighborId", json_object_string_addf(json_remote_label, "neighborId", "%pI4",
inet_ntop(AF_INET, &rt->nexthop, &rt->nexthop);
buf, sizeof(buf)));
json_object_string_add(json_remote_label, "label", json_object_string_add(json_remote_label, "label",
log_label(rt->remote_label)); log_label(rt->remote_label));
json_object_int_add(json_remote_label, "inUse", rt->in_use); json_object_int_add(json_remote_label, "inUse", rt->in_use);
@ -1401,9 +1391,8 @@ show_l2vpn_binding_msg_json(struct imsg *imsg, struct show_params *params,
pw = imsg->data; pw = imsg->data;
json_pw = json_object_new_object(); json_pw = json_object_new_object();
json_object_string_add(json_pw, "destination", json_object_string_addf(json_pw, "destination", "%pI4",
inet_ntop(AF_INET, &pw->lsr_id, buf, &pw->lsr_id);
sizeof(buf)));
json_object_int_add(json_pw, "vcId", pw->pwid); json_object_int_add(json_pw, "vcId", pw->pwid);
/* local binding */ /* local binding */
@ -1489,9 +1478,7 @@ show_l2vpn_pw_msg_json(struct imsg *imsg, struct show_params *params,
pw = imsg->data; pw = imsg->data;
json_pw = json_object_new_object(); json_pw = json_object_new_object();
json_object_string_add(json_pw, "peerId", json_object_string_addf(json_pw, "peerId", "%pI4", &pw->lsr_id);
inet_ntop(AF_INET, &pw->lsr_id,
buf, sizeof(buf)));
json_object_int_add(json_pw, "vcId", pw->pwid); json_object_int_add(json_pw, "vcId", pw->pwid);
json_object_string_add(json_pw, "VpnName", pw->l2vpn_name); json_object_string_add(json_pw, "VpnName", pw->l2vpn_name);
if (pw->status == PW_FORWARDING) if (pw->status == PW_FORWARDING)