From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 22 May 2017 19:35:42 +0000 (-0400)
Subject: pimd: Add code to write spaces or not before 'ip pim rp'
X-Git-Tag: frr-4.0-dev~468^2~86
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0c8b717ee6c1d98f800c0f008e4d72e6a4f240bd;p=mirror%2Ffrr.git

pimd: Add code to write spaces or not before 'ip pim rp'

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 8e42bf6fbd..6837d7eaa3 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -793,7 +793,8 @@ int pim_rp_set_upstream_addr(struct pim_instance *pim, struct in_addr *up,
 	return 1;
 }
 
-int pim_rp_config_write(struct pim_instance *pim, struct vty *vty)
+int pim_rp_config_write(struct pim_instance *pim, struct vty *vty,
+			const char *spaces)
 {
 	struct listnode *node;
 	struct rp_info *rp_info;
@@ -806,13 +807,13 @@ int pim_rp_config_write(struct pim_instance *pim, struct vty *vty)
 			continue;
 
 		if (rp_info->plist)
-			vty_out(vty, "ip pim rp %s prefix-list %s\n",
+			vty_out(vty, "%sip pim rp %s prefix-list %s\n", spaces,
 				inet_ntop(AF_INET,
 					  &rp_info->rp.rpf_addr.u.prefix4,
 					  rp_buffer, 32),
 				rp_info->plist);
 		else
-			vty_out(vty, "ip pim rp %s %s\n",
+			vty_out(vty, "%sip pim rp %s %s\n", spaces,
 				inet_ntop(AF_INET,
 					  &rp_info->rp.rpf_addr.u.prefix4,
 					  rp_buffer, 32),
diff --git a/pimd/pim_rp.h b/pimd/pim_rp.h
index 40062c3d50..e07d65137f 100644
--- a/pimd/pim_rp.h
+++ b/pimd/pim_rp.h
@@ -46,7 +46,8 @@ int pim_rp_del(struct pim_instance *pim, const char *rp, const char *group,
 void pim_rp_prefix_list_update(struct pim_instance *pim,
 			       struct prefix_list *plist);
 
-int pim_rp_config_write(struct pim_instance *pim, struct vty *vty);
+int pim_rp_config_write(struct pim_instance *pim, struct vty *vty,
+			const char *spaces);
 
 void pim_rp_setup(struct pim_instance *pim);
 
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 2a3f183b75..b1c44c3e8c 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -146,6 +146,12 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
 {
 	int writes = 0;
 	struct pim_ssm *ssm = pim->ssm_info;
+	char spaces[10];
+
+	if (pim->vrf_id == VRF_DEFAULT)
+		sprintf(spaces, "%s", "");
+	else
+		sprintf(spaces, "%s", " ");
 
 	writes += pim_msdp_config_write_helper(pim, vty);
 
@@ -154,7 +160,7 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
 		++writes;
 	}
 
-	writes += pim_rp_config_write(pim, vty);
+	writes += pim_rp_config_write(pim, vty, spaces);
 
 	if (qpim_register_suppress_time
 	    != PIM_REGISTER_SUPPRESSION_TIME_DEFAULT) {