summaryrefslogtreecommitdiffstats
path: root/ospfd
diff options
context:
space:
mode:
authorRuss White <russ@riw.us>2024-09-24 16:03:05 +0200
committerGitHub <noreply@github.com>2024-09-24 16:03:05 +0200
commit849df49bbd94988dfc76a386a2f6270d3763d45d (patch)
tree397dd724750742b35489ca3ab73a0d9978cda34b /ospfd
parentMerge pull request #16838 from opensourcerouting/fix/refresh_pr_9079 (diff)
parentospfd: reset spf_hold_multiplier when current SPF delay state is changed (diff)
downloadfrr-849df49bbd94988dfc76a386a2f6270d3763d45d.tar.xz
frr-849df49bbd94988dfc76a386a2f6270d3763d45d.zip
Merge pull request #16851 from Shbinging/fix_timer_throttle_spf
ospfd: reset spf_hold_multiplier when current SPF delay state is changed
Diffstat (limited to 'ospfd')
-rw-r--r--ospfd/ospf_vty.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 7ae4ea04c..68d79aef9 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2291,6 +2291,10 @@ static int ospf_timers_spf_set(struct vty *vty, unsigned int delay,
{
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
+ if (ospf->spf_delay != delay || ospf->spf_holdtime != hold ||
+ ospf->spf_max_holdtime != max)
+ ospf->spf_hold_multiplier = 1;
+
ospf->spf_delay = delay;
ospf->spf_holdtime = hold;
ospf->spf_max_holdtime = max;