]> git.puffer.fish Git - mirror/frr.git/commitdiff
bgpd: Fix usage of JSON_C_TO_STRING_NOSLASHESCAPE
authorDonald Sharp <sharpd@nvidia.com>
Tue, 7 Sep 2021 13:40:12 +0000 (09:40 -0400)
committerDonald Sharp <sharpd@nvidia.com>
Tue, 7 Sep 2021 13:40:12 +0000 (09:40 -0400)
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>
bgpd/bgp_evpn_vty.c

index 2bda5dbf9a962153af6e662e254bde978e48139a..867efb6099146c42d9e939cbace31492ef5c00f6 100644 (file)
@@ -396,8 +396,6 @@ static void display_l3vni(struct vty *vty, struct bgp *bgp_vrf,
                                  originator_ip, sizeof(originator_ip)));
                json_object_string_add(json, "advertiseGatewayMacip", "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",
                                       bgp_vrf->evpn_info->advertise_pip ?
                                       "Enabled" : "Disabled");
@@ -967,8 +965,6 @@ static void show_l3vni_entry(struct vty *vty, struct bgp *bgp,
                json_object_string_add(json_vni, "advertiseGatewayMacip",
                                       "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_vni, "advertisePip",
                        bgp->evpn_info->advertise_pip ? "Enabled" : "Disabled");
@@ -4413,8 +4409,11 @@ DEFUN(show_bgp_l2vpn_evpn_vni,
        }
 
        if (uj) {
-               vty_out(vty, "%s\n", json_object_to_json_string_ext(
-                                            json, JSON_C_TO_STRING_PRETTY));
+               vty_out(vty, "%s\n",
+                       json_object_to_json_string_ext(
+                               json,
+                               JSON_C_TO_STRING_PRETTY
+                                       | JSON_C_TO_STRING_NOSLASHESCAPE));
                json_object_free(json);
        }