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

bgpd: Fix usage of JSON_C_TO_STRING_NOSLASHESCAPE

Browse Source 
The usage of json_object_to_json_string_ext is mean for
generation of output string and returns a `char *` pointer
to the `formatted` output.  Just calling it does nothing
and it's expensive to boot.

Modify the code in bgpd to just output with the NOSLASHESCAPE
when outputting.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-09-07 09:40:12 -04:00
parent e77564ccd4
commit 192422ef3b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bgpd/bgp_evpn_vty.c
View File

@ -396,8 +396,6 @@ static void display_l3vni(struct vty *vty, struct bgp *bgp_vrf,
originator_ip, sizeof(originator_ip))); originator_ip, sizeof(originator_ip)));
json_object_string_add(json, "advertiseGatewayMacip", "n/a"); json_object_string_add(json, "advertiseGatewayMacip", "n/a");
json_object_string_add(json, "advertiseSviMacIp", "n/a"); json_object_string_add(json, "advertiseSviMacIp", "n/a");
json_object_to_json_string_ext(json,
JSON_C_TO_STRING_NOSLASHESCAPE);
json_object_string_add(json, "advertisePip", json_object_string_add(json, "advertisePip",
bgp_vrf->evpn_info->advertise_pip ? bgp_vrf->evpn_info->advertise_pip ?
"Enabled" : "Disabled"); "Enabled" : "Disabled");
@ -967,8 +965,6 @@ static void show_l3vni_entry(struct vty *vty, struct bgp *bgp,
json_object_string_add(json_vni, "advertiseGatewayMacip", json_object_string_add(json_vni, "advertiseGatewayMacip",
"n/a"); "n/a");
json_object_string_add(json_vni, "advertiseSviMacIp", "n/a"); json_object_string_add(json_vni, "advertiseSviMacIp", "n/a");
json_object_to_json_string_ext(json_vni,
JSON_C_TO_STRING_NOSLASHESCAPE);
json_object_string_add( json_object_string_add(
json_vni, "advertisePip", json_vni, "advertisePip",
bgp->evpn_info->advertise_pip ? "Enabled" : "Disabled"); bgp->evpn_info->advertise_pip ? "Enabled" : "Disabled");
@ -4413,8 +4409,11 @@ DEFUN(show_bgp_l2vpn_evpn_vni,
} }
if (uj) { if (uj) {
vty_out(vty, "%s\n", json_object_to_json_string_ext( vty_out(vty, "%s\n",
json, JSON_C_TO_STRING_PRETTY)); json_object_to_json_string_ext(
json,
JSON_C_TO_STRING_PRETTY
| JSON_C_TO_STRING_NOSLASHESCAPE));
json_object_free(json); json_object_free(json);
} }