diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2021-05-09 19:31:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 19:31:36 +0200 |
| commit | 466623224712f03771a4cb9594c1b0fc76e8ab8d (patch) | |
| tree | d9db4cdbcc86479c9b477c7ea32fa0858d2420e5 /pimd/pim_vty.c | |
| parent | Merge pull request #8380 from mjstapp/nexthop_cmp_basic (diff) | |
| parent | pimd: adjust rp_keep_alive_time when register_suppress_time is changed (diff) | |
| download | frr-466623224712f03771a4cb9594c1b0fc76e8ab8d.tar.xz frr-466623224712f03771a4cb9594c1b0fc76e8ab8d.zip | |
Merge pull request #8631 from dslicenc/pimd-timer-fix
Diffstat (limited to 'pimd/pim_vty.c')
| -rw-r--r-- | pimd/pim_vty.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 76e9c3f0a..929d35101 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -186,16 +186,24 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty) writes += pim_rp_config_write(pim, vty, spaces); - if (router->register_suppress_time - != PIM_REGISTER_SUPPRESSION_TIME_DEFAULT) { - vty_out(vty, "%sip pim register-suppress-time %d\n", spaces, - router->register_suppress_time); - ++writes; - } - if (router->t_periodic != PIM_DEFAULT_T_PERIODIC) { - vty_out(vty, "%sip pim join-prune-interval %d\n", spaces, - router->t_periodic); - ++writes; + if (pim->vrf_id == VRF_DEFAULT) { + if (router->register_suppress_time + != PIM_REGISTER_SUPPRESSION_TIME_DEFAULT) { + vty_out(vty, "%sip pim register-suppress-time %d\n", + spaces, router->register_suppress_time); + ++writes; + } + if (router->t_periodic != PIM_DEFAULT_T_PERIODIC) { + vty_out(vty, "%sip pim join-prune-interval %d\n", + spaces, router->t_periodic); + ++writes; + } + + if (router->packet_process != PIM_DEFAULT_PACKET_PROCESS) { + vty_out(vty, "%sip pim packets %d\n", spaces, + router->packet_process); + ++writes; + } } if (pim->keep_alive_time != PIM_KEEPALIVE_PERIOD) { vty_out(vty, "%sip pim keep-alive-timer %d\n", spaces, @@ -207,11 +215,6 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty) pim->rp_keep_alive_time); ++writes; } - if (router->packet_process != PIM_DEFAULT_PACKET_PROCESS) { - vty_out(vty, "%sip pim packets %d\n", spaces, - router->packet_process); - ++writes; - } if (ssm->plist_name) { vty_out(vty, "%sip pim ssm prefix-list %s\n", spaces, ssm->plist_name); |