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 8e42bf6fbd97260fb2af3d3e9edf6b7a5521bfd7..6837d7eaa3dfff2ebe7fb2829ecee6b620c6831c 100644 (file)
--- 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 40062c3d5078757769e81ff52a5db8a74b31b941..e07d65137ff0d736a422a81e244d5e08d2f6be71 100644 (file)
--- 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 2a3f183b7549d1e1ae982b936a6189de18f042a7..b1c44c3e8c5aac276940c6d8813298c5c98f6e1c 100644 (file)
--- 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) {