zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / pimd / pim_cmd.c

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 8ef8f87d153e23b2ee4522af73a09384cb0f49d3..26932eea203e6e4f0e53d888d6938420a3452de2 100644 (file)
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1187,8 +1187,9 @@ static void pim_show_interfaces_single(struct pim_instance *pim,
                        vty_out(vty, "Designated Router\n");
                        vty_out(vty, "-----------------\n");
                        vty_out(vty, "Address   : %s\n", dr_str);
-                       vty_out(vty, "Priority  : %d\n",
-                               pim_ifp->pim_dr_priority);
+                       vty_out(vty, "Priority  : %d(%d)\n",
+                               pim_ifp->pim_dr_priority,
+                               pim_ifp->pim_dr_num_nondrpri_neighbors);
                        vty_out(vty, "Uptime    : %s\n", dr_uptime);
                        vty_out(vty, "Elections : %d\n",
                                pim_ifp->pim_dr_election_count);
@@ -5766,7 +5767,7 @@ static int pim_cmd_igmp_start(struct vty *vty, struct interface *ifp)
        pim_ifp = ifp->info;
 
        if (!pim_ifp) {
-               pim_ifp = pim_if_new(ifp, 1 /* igmp=true */, 0 /* pim=false */);
+               pim_ifp = pim_if_new(ifp, true, false, false);
                if (!pim_ifp) {
                        vty_out(vty, "Could not enable IGMP on interface %s\n",
                                ifp->name);
@@ -6377,7 +6378,7 @@ static int pim_cmd_interface_add(struct interface *ifp)
        struct pim_interface *pim_ifp = ifp->info;
 
        if (!pim_ifp) {
-               pim_ifp = pim_if_new(ifp, 0 /* igmp=false */, 1 /* pim=true */);
+               pim_ifp = pim_if_new(ifp, false, true, false);
                if (!pim_ifp) {
                        return 0;
                }
@@ -6474,13 +6475,13 @@ static int pim_cmd_interface_delete(struct interface *ifp)
 
 static int interface_no_ip_pim_helper(struct vty *vty)
 {
-        VTY_DECLVAR_CONTEXT(interface, ifp);
-        if (!pim_cmd_interface_delete(ifp)) {
-                vty_out(vty, "Unable to delete interface information\n");
-                return CMD_WARNING_CONFIG_FAILED;
-        }
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       if (!pim_cmd_interface_delete(ifp)) {
+               vty_out(vty, "Unable to delete interface information\n");
+               return CMD_WARNING_CONFIG_FAILED;
+       }
 
-        return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
 DEFUN_HIDDEN (interface_no_ip_pim_ssm,