From: Mitesh Kanjariya <mitesh@marvel-07.cumulusnetworks.com>
Date: Tue, 17 Oct 2017 08:33:24 +0000 (-0700)
Subject: bgpd: json support for show bgp l2vpn evpn vrf-import-rt
X-Git-Tag: frr-4.0-dev~58^2~52
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=181c08c6fce338d5f6a7f5fb121be82485780445;p=matthieu%2Ffrr.git

bgpd: json support for show bgp l2vpn evpn vrf-import-rt

Signed-off-by: Mitesh Kanjariya <mitesh@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index c3f77aba27..03e3545b4e 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -158,8 +158,8 @@ static void show_vrf_import_rt_entry(struct hash_backet *backet,
 	struct vty *vty = NULL;
 	struct vrf_irt_node *irt = (struct vrf_irt_node *)backet->data;
 
-	vty = args[0];
-	json = args[1];
+	vty = (struct vty *)args[0];
+	json = (struct json_object *)args[1];
 
 	display_vrf_import_rt(vty, irt, json);
 }
@@ -2982,7 +2982,7 @@ DEFUN(show_bgp_l2vpn_evpn_vrf_import_rt,
       JSON_STR)
 {
 	u_char uj = 0;
-	struct bgp *bgp_def;
+	struct bgp *bgp_def = NULL;
 	json_object *json = NULL;
 
 	bgp_def = bgp_get_default();
diff --git a/lib/vrf.c b/lib/vrf.c
index 6a0ab55b81..3c34b95262 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -233,7 +233,7 @@ const char *vrf_id_to_name(vrf_id_t vrf_id)
 	if (vrf)
 		return vrf->name;
 
-	return NULL;
+	return "n/a";
 }
 
 vrf_id_t vrf_name_to_id(const char *name)