diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-14 09:19:13 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-24 13:51:37 -0400 |
| commit | 6196ed7154f066a132e27a5e02370073b9e67aef (patch) | |
| tree | 9698120a42cb2f40d807c16bcef111f2b6010893 /pimd/pim_vty.c | |
| parent | a01538df211a2767f8b9f888e09482cd9261d3b1 (diff) | |
pimd: Get the default pim code ready to write into vrf's or not
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_vty.c')
| -rw-r--r-- | pimd/pim_vty.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index bcbceb75b9..0bc0eb589a 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -142,19 +142,20 @@ int pim_debug_config_write(struct vty *vty) return writes; } -int pim_global_config_write(struct vty *vty) +static int pim_global_config_write_worker(struct pim_instance *pim, + struct vty *vty) { int writes = 0; - struct pim_ssm *ssm = pimg->ssm_info; + struct pim_ssm *ssm = pim->ssm_info; writes += pim_msdp_config_write(vty); - if (!pimg->send_v6_secondary) { + if (!pim->send_v6_secondary) { vty_out(vty, "no ip pim send-v6-secondary\n"); ++writes; } - writes += pim_rp_config_write(pimg, vty); + writes += pim_rp_config_write(pim, vty); if (qpim_register_suppress_time != PIM_REGISTER_SUPPRESSION_TIME_DEFAULT) { @@ -180,11 +181,11 @@ int pim_global_config_write(struct vty *vty) vty_out(vty, "ip pim ssm prefix-list %s\n", ssm->plist_name); ++writes; } - if (pimg->spt.switchover == PIM_SPT_INFINITY) { - if (pimg->spt.plist) + if (pim->spt.switchover == PIM_SPT_INFINITY) { + if (pim->spt.plist) vty_out(vty, "ip pim spt-switchover infinity-and-beyond prefix-list %s\n", - pimg->spt.plist); + pim->spt.plist); else vty_out(vty, "ip pim spt-switchover infinity-and-beyond\n"); @@ -214,6 +215,11 @@ int pim_global_config_write(struct vty *vty) return writes; } +int pim_global_config_write(struct vty *vty) +{ + return pim_global_config_write_worker(pimg, vty); +} + int pim_interface_config_write(struct vty *vty) { struct pim_instance *pim; |