proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1567 from donaldsharp/json_fixes

Browse Source 
Json fixes
This commit is contained in:
Renato Westphal 2017-12-19 14:14:26 -02:00 committed by GitHub
commit 1de057636f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_evpn_vty.c
View File

@ -414,9 +414,9 @@ static void show_vni_entry(struct hash_backet *backet, void *args[])
{ {
struct vty *vty; struct vty *vty;
json_object *json; json_object *json;
json_object *json_vni; json_object *json_vni = NULL;
json_object *json_import_rtl; json_object *json_import_rtl = NULL;
json_object *json_export_rtl; json_object *json_export_rtl = NULL;
struct bgpevpn *vpn = (struct bgpevpn *)backet->data; struct bgpevpn *vpn = (struct bgpevpn *)backet->data;
char buf1[10]; char buf1[10];
char buf2[RD_ADDRSTRLEN]; char buf2[RD_ADDRSTRLEN];

4
bgpd/bgp_route.c
View File

@ -8396,6 +8396,7 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi,
vty_out(vty, "%s", vty_out(vty, "%s",
json_object_to_json_string_ext(json_paths, JSON_C_TO_STRING_PRETTY)); json_object_to_json_string_ext(json_paths, JSON_C_TO_STRING_PRETTY));
json_object_free(json_paths); json_object_free(json_paths);
json_paths = NULL;
first = 0; first = 0;
} }
} }
@ -8409,7 +8410,8 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi,
*total_cum = total_count; *total_cum = total_count;
} }
if (use_json) { if (use_json) {
json_object_free(json_paths); if (json_paths)
json_object_free(json_paths);
if (is_last) if (is_last)
vty_out(vty, " } }\n"); vty_out(vty, " } }\n");
else else