diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-04-01 07:58:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-01 07:58:05 -0400 |
| commit | 2aaa554de9535e9299519d82b11f55f12c808975 (patch) | |
| tree | 504a77d6bbb076ac8ba7a564e8b15c597bd5afad /pimd/pim_vty.c | |
| parent | 2e725ad140e14ed03195028881be65c2cefc079a (diff) | |
| parent | 2b5c7fa46d98ea35f6febd5b3da32ca0a2445ca2 (diff) | |
Merge branch 'master' into pim_5549
Diffstat (limited to 'pimd/pim_vty.c')
| -rw-r--r-- | pimd/pim_vty.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 9788c58cd9..55855e5a6a 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -38,6 +38,7 @@ #include "pim_static.h" #include "pim_rp.h" #include "pim_msdp.h" +#include "pim_ssm.h" int pim_debug_config_write (struct vty *vty) @@ -145,6 +146,7 @@ pim_debug_config_write (struct vty *vty) int pim_global_config_write(struct vty *vty) { int writes = 0; + struct pim_ssm *ssm = pimg->ssm_info; writes += pim_msdp_config_write (vty); @@ -180,6 +182,12 @@ int pim_global_config_write(struct vty *vty) qpim_packet_process, VTY_NEWLINE); ++writes; } + if (ssm->plist_name) + { + vty_out (vty, "ip pim ssm prefix-list %s%s", + ssm->plist_name, VTY_NEWLINE); + ++writes; + } if (qpim_ssmpingd_list) { struct listnode *node; @@ -212,12 +220,8 @@ int pim_interface_config_write(struct vty *vty) if (ifp->info) { struct pim_interface *pim_ifp = ifp->info; - /* IF ip pim ssm */ if (PIM_IF_TEST_PIM(pim_ifp->options)) { - if (pim_ifp->itype == PIM_INTERFACE_SSM) - vty_out(vty, " ip pim ssm%s", VTY_NEWLINE); - else - vty_out(vty, " ip pim sm%s", VTY_NEWLINE); + vty_out(vty, " ip pim sm%s", VTY_NEWLINE); ++writes; } |