summaryrefslogtreecommitdiffstats
path: root/pimd/pim_upstream.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-07-13 03:16:00 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-07-28 14:03:50 +0200
commit19b807ca178f017c57f3abf36d21c93d641cec50 (patch)
tree9c208173f1fc7690a75afb4af9164ebd2911e5a9 /pimd/pim_upstream.c
parentpimd: Setup hash names appropriately (diff)
downloadfrr-19b807ca178f017c57f3abf36d21c93d641cec50.tar.xz
frr-19b807ca178f017c57f3abf36d21c93d641cec50.zip
pimd: Allow the keepalive time to be per vrf.
Allow the keepalive period to be per vrf. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_upstream.c')
-rw-r--r--pimd/pim_upstream.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 96aaff09b..a8506501e 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -541,7 +541,7 @@ void pim_upstream_switch(struct pim_instance *pim, struct pim_upstream *up,
&& PIM_UPSTREAM_FLAG_TEST_SRC_STREAM(
up->flags)) {
pim_upstream_keep_alive_timer_start(
- up, qpim_keep_alive_time);
+ up, pim->keep_alive_time);
pim_register_join(up);
}
} else {
@@ -1664,9 +1664,9 @@ static void pim_upstream_sg_running(void *arg)
PIM_UPSTREAM_FLAG_SET_SRC_STREAM(up->flags);
pim_upstream_fhr_kat_start(up);
}
- pim_upstream_keep_alive_timer_start(up, qpim_keep_alive_time);
+ pim_upstream_keep_alive_timer_start(up, pim->keep_alive_time);
} else if (PIM_UPSTREAM_FLAG_TEST_SRC_LHR(up->flags))
- pim_upstream_keep_alive_timer_start(up, qpim_keep_alive_time);
+ pim_upstream_keep_alive_timer_start(up, pim->keep_alive_time);
if (up->sptbit != PIM_UPSTREAM_SPTBIT_TRUE) {
pim_upstream_set_sptbit(up, up->rpf.source_nexthop.interface);