summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorclaudio <claudio@openbsd.org>2009-12-03 19:27:20 +0000
committerclaudio <claudio@openbsd.org>2009-12-03 19:27:20 +0000
commit191d8ab0e2536c7d20cc3f68273621993dedc132 (patch)
treec29fa2282950285bf866bea7ae151c8610f387b2
parentA bgpctl nei XY clear should not restart neighbors that are administrativly (diff)
downloadwireguard-openbsd-191d8ab0e2536c7d20cc3f68273621993dedc132.tar.xz
wireguard-openbsd-191d8ab0e2536c7d20cc3f68273621993dedc132.zip
Stop the IdleHold timer when going to idle state. This makes it a bit
more clear that going to idle state will stop everything and it is necessary to start the IdleHold timer to restart sessions. OK henning@
-rw-r--r--usr.sbin/bgpd/session.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index f1f2b7faef9..e1a95c724f6 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.300 2009/12/01 14:28:05 claudio Exp $ */
+/* $OpenBSD: session.c,v 1.301 2009/12/03 19:27:20 claudio Exp $ */
/*
* Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -926,6 +926,7 @@ change_state(struct peer *peer, enum session_state state,
timer_stop(peer, Timer_ConnectRetry);
timer_stop(peer, Timer_Keepalive);
timer_stop(peer, Timer_Hold);
+ timer_stop(peer, Timer_IdleHold);
timer_stop(peer, Timer_IdleHoldReset);
session_close_connection(peer);
msgbuf_clear(&peer->wbuf);