summaryrefslogtreecommitdiffstats
path: root/pimd/pim_instance.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2018-06-07 16:23:32 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2018-06-07 16:23:32 +0200
commit4795fff748d6b55479b60013fd2dc8fdf8b4c7c2 (patch)
tree38aa32a9d0a6d834d9badaea95f971bb80803469 /pimd/pim_instance.c
parentMerge pull request #2335 from donaldsharp/bgp_memory_hooliganism (diff)
downloadfrr-4795fff748d6b55479b60013fd2dc8fdf8b4c7c2.tar.xz
frr-4795fff748d6b55479b60013fd2dc8fdf8b4c7c2.zip
pimd: Fix ecmp_enable and ecmp_rebalance_enable
These commands were being accepted in all vrf's and affecting all vrf's behavior globally, since they were global variables. Modify the code to make these two commands work on a per-vrf basis. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_instance.c')
-rw-r--r--pimd/pim_instance.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index 7e5bb34e3..cb70ee790 100644
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -77,6 +77,8 @@ static struct pim_instance *pim_instance_init(struct vrf *vrf)
pim->keep_alive_time = PIM_KEEPALIVE_PERIOD;
pim->rp_keep_alive_time = PIM_RP_KEEPALIVE_PERIOD;
+ pim->ecmp_enable = false;
+ pim->ecmp_rebalance_enable = false;
pim->vrf_id = vrf->vrf_id;
pim->vrf = vrf;