proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 17:27:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: Fix usage of JSON_C_TO_STRING_NOSLASHESCAPE

Browse Source 
The usage of json_object_to_json_string_ext is meant 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 ospfd 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:36:39 -04:00
parent b44f7c3f6d
commit e77564ccd4
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ospfd/ospf_vty.c
View File

@ -10608,11 +10608,8 @@ static void show_ip_ospf_route_network(struct vty *vty, struct ospf *ospf,
prefix2str(&rn->p, buf1, sizeof(buf1));
json_route = json_object_new_object();
if (json) {
if (json)
json_object_object_add(json, buf1, json_route);
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_NOSLASHESCAPE);
}
switch (or->path_type) {
case OSPF_PATH_INTER_AREA:
@ -10909,11 +10906,8 @@ static void show_ip_ospf_route_external(struct vty *vty, struct ospf *ospf,
snprintfrr(buf1, sizeof(buf1), "%pFX", &rn->p);
json_route = json_object_new_object();
if (json) {
if (json)
json_object_object_add(json, buf1, json_route);
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_NOSLASHESCAPE);
}
switch (er->path_type) {
case OSPF_PATH_TYPE1_EXTERNAL:
@ -11224,7 +11218,9 @@ DEFUN (show_ip_ospf_route,
if (uj) {
/* Keep Non-pretty format */
vty_out(vty, "%s\n",
json_object_to_json_string(json));
json_object_to_json_string_ext(
json,
JSON_C_TO_STRING_NOSLASHESCAPE));
json_object_free(json);
} else if (!ospf_output)
vty_out(vty, "%% OSPF instance not found\n");
@ -11236,7 +11232,9 @@ DEFUN (show_ip_ospf_route,
if (uj) {
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
json,
JSON_C_TO_STRING_PRETTY
| JSON_C_TO_STRING_NOSLASHESCAPE));
json_object_free(json);
} else
vty_out(vty, "%% OSPF instance not found\n");
@ -11250,7 +11248,9 @@ DEFUN (show_ip_ospf_route,
if (uj) {
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_PRETTY));
json,
JSON_C_TO_STRING_PRETTY
| JSON_C_TO_STRING_NOSLASHESCAPE));
json_object_free(json);
} else
vty_out(vty, "%% OSPF instance not found\n");
@ -11263,7 +11263,9 @@ DEFUN (show_ip_ospf_route,
ret = show_ip_ospf_route_common(vty, ospf, json, use_vrf);
/* Keep Non-pretty format */
if (uj)
vty_out(vty, "%s\n", json_object_to_json_string(json));
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json, JSON_C_TO_STRING_NOSLASHESCAPE));
}
if (uj)