summaryrefslogtreecommitdiff
path: root/pimd/pim_vty.c
diff options
context:
space:
mode:
Diffstat (limited to 'pimd/pim_vty.c')
-rw-r--r--pimd/pim_vty.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 4c3762b2ed..fc9781b239 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -180,8 +180,10 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
int writes = 0;
struct pim_ssm *ssm = pim->ssm_info;
+#if PIM_IPV == 4
writes += pim_msdp_peer_config_write(vty, pim);
writes += pim_msdp_config_write(pim, vty);
+#endif /* PIM_IPV == 4 */
if (!pim->send_v6_secondary) {
vty_out(vty, " no send-v6-secondary\n");
@@ -273,17 +275,6 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
}
}
- if (pim->msdp.hold_time != PIM_MSDP_PEER_HOLD_TIME
- || pim->msdp.keep_alive != PIM_MSDP_PEER_KA_TIME
- || pim->msdp.connection_retry != PIM_MSDP_PEER_CONNECT_RETRY_TIME) {
- vty_out(vty, " msdp timers %u %u", pim->msdp.hold_time,
- pim->msdp.keep_alive);
- if (pim->msdp.connection_retry
- != PIM_MSDP_PEER_CONNECT_RETRY_TIME)
- vty_out(vty, " %u", pim->msdp.connection_retry);
- vty_out(vty, "\n");
- }
-
return writes;
}