diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-01-30 09:07:15 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-01-30 09:21:42 +0100 |
| commit | 57dac17c57a1b84c4389da11cee32b31b6957dd2 (patch) | |
| tree | e228f5157151ff208f934a4b4647973dc5a160b2 /pimd/pim_instance.c | |
| parent | Merge pull request #1690 from dslicenc/bgpd-vrf-show-cm17377 (diff) | |
| download | frr-57dac17c57a1b84c4389da11cee32b31b6957dd2.tar.xz frr-57dac17c57a1b84c4389da11cee32b31b6957dd2.zip | |
lib, pimd: Remove PIM_NODE as it is not needed
The PIM_NODE command is only being used to display
default vrf configuration. Move this into the
vrf display and remove PIM_NODE.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_instance.c')
| -rw-r--r-- | pimd/pim_instance.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c index 8da610a3a..9b7ef2e07 100644 --- a/pimd/pim_instance.c +++ b/pimd/pim_instance.c @@ -198,12 +198,13 @@ static int pim_vrf_config_write(struct vty *vty) if (!pim) continue; - if (vrf->vrf_id == VRF_DEFAULT) - continue; + if (vrf->vrf_id != VRF_DEFAULT) + vty_frame(vty, "vrf %s\n", vrf->name); - vty_frame(vty, "vrf %s\n", vrf->name); pim_global_config_write_worker(pim, vty); - vty_endframe(vty, "!\n"); + + if (vrf->vrf_id != VRF_DEFAULT) + vty_endframe(vty, "!\n"); } return 0; |