summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2025-03-25 09:01:38 -0400
committerGitHub <noreply@github.com>2025-03-25 09:01:38 -0400
commitefa78f28ab0c156b76586bb427d49f5bdb600676 (patch)
treedfa7ac0df446b61b850488c5f5ab440b67047f7e
parent26f939b17def81d6cda9463b67bab352a387c011 (diff)
parentbf5b8d768430c690201d77b3194cee6dd42fb0f9 (diff)
Merge pull request #18490 from opensourcerouting/fix/backport_9a26a56c5188fd1c95e244932bc17f97b9051935_10.1
bgpd: Fix holdtime not working properly when busy
-rw-r--r--bgpd/bgp_fsm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index b07afaf384..79e36fa0a5 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -524,9 +524,11 @@ static void bgp_holdtime_timer(struct event *thread)
*/
inq_count = atomic_load_explicit(&connection->ibuf->count,
memory_order_relaxed);
- if (inq_count)
+ if (inq_count) {
BGP_TIMER_ON(connection->t_holdtime, bgp_holdtime_timer,
peer->v_holdtime);
+ return;
+ }
EVENT_VAL(thread) = Hold_Timer_expired;
bgp_event(thread); /* bgp_event unlocks peer */