diff options
Diffstat (limited to 'pimd/pim_vty.c')
| -rw-r--r-- | pimd/pim_vty.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index ed91d2339b..974cf30cf1 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -12,6 +12,8 @@ #include "vty.h" #include "vrf.h" #include "plist.h" +#include "plist_int.h" +#include "filter.h" #include "pimd.h" #include "pim_vty.h" @@ -178,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"); @@ -271,15 +275,14 @@ 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"); + if (pim->rpf_mode != MCAST_NO_CONFIG) { + ++writes; + vty_out(vty, " rpf-lookup-mode %s\n", + pim->rpf_mode == MCAST_URIB_ONLY ? "urib-only" + : pim->rpf_mode == MCAST_MRIB_ONLY ? "mrib-only" + : pim->rpf_mode == MCAST_MIX_MRIB_FIRST ? "mrib-then-urib" + : pim->rpf_mode == MCAST_MIX_DISTANCE ? "lower-distance" + : "longer-prefix"); } return writes; @@ -492,7 +495,13 @@ int pim_config_write(struct vty *vty, int writes, struct interface *ifp, /* boundary */ if (pim_ifp->boundary_oil_plist) { vty_out(vty, " " PIM_AF_NAME " multicast boundary oil %s\n", - pim_ifp->boundary_oil_plist); + pim_ifp->boundary_oil_plist->name); + ++writes; + } + + if (pim_ifp->boundary_acl) { + vty_out(vty, " " PIM_AF_NAME " multicast boundary %s\n", + pim_ifp->boundary_acl->name); ++writes; } |