summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
authorIgor Ryzhov <iryzhov@nfware.com>2022-01-23 22:07:20 +0100
committerIgor Ryzhov <iryzhov@nfware.com>2022-01-24 12:44:05 +0100
commit788a036fdb57d733371b180d1d295ce6ca72bf5d (patch)
treeda6694b6b0d78fd1b679ba02a7808f0fe01f964f /pimd
parentMerge pull request #10398 from patrasar/pim_debug_fix (diff)
downloadfrr-788a036fdb57d733371b180d1d295ce6ca72bf5d.tar.xz
frr-788a036fdb57d733371b180d1d295ce6ca72bf5d.zip
*: do not print vrf name for interface config when using vrf-lite
VRF name should not be printed in the config since 574445ec. The update was done for NB config output but I missed it for regular vty output. Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_vty.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 81e1ac4e3..8c0132a9a 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -302,11 +302,8 @@ int pim_interface_config_write(struct vty *vty)
continue;
/* IF name */
- if (vrf->vrf_id == VRF_DEFAULT)
- vty_frame(vty, "interface %s\n", ifp->name);
- else
- vty_frame(vty, "interface %s vrf %s\n",
- ifp->name, vrf->name);
+ if_vty_config_start(vty, ifp);
+
++writes;
if (ifp->desc) {
@@ -455,7 +452,7 @@ int pim_interface_config_write(struct vty *vty)
pim_bfd_write_config(vty, ifp);
++writes;
}
- vty_endframe(vty, "exit\n!\n");
+ if_vty_config_end(vty);
++writes;
}
}