Merge branch 'master' into pim_5549

[mirror_frr.git] / pimd / pim_vty.c

diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 9788c58cd9b0d6434d9971439a26b1fab657c906..55855e5a6a1ac9c5cbc00b05f34c8d0ad3538698 100644 (file)
--- 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;
       }