summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2003-12-19 21:26:48 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2003-12-19 21:26:48 +0000
commit1b0ee5f414f67c7f359e223a8ef34e336af9ad06 (patch)
treee2ce74eb30adfbbe26422109edb209a43a31aa83
parentcbefc096457fc348d1601abb18e1389c7fc2cd15 (diff)
Small typo/pasto big effect. Muddled keepalive timer with holdtimer.
Additionaly the keepalive timer is automaticaly restarted by session_keepalive(). help & OK hungry henning :)
-rw-r--r--usr.sbin/bgpd/session.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index bef259f6640..2017bd6efef 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.11 2003/12/19 21:06:46 henning Exp $ */
+/* $OpenBSD: session.c,v 1.12 2003/12/19 21:26:47 claudio Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -426,7 +426,6 @@ bgp_fsm(struct peer *peer, enum session_events event)
if (parse_open(peer))
change_state(peer, STATE_IDLE, event);
else {
- start_timer_keepalive(peer);
session_keepalive(peer);
change_state(peer, STATE_OPENCONFIRM, event);
}
@@ -460,7 +459,6 @@ bgp_fsm(struct peer *peer, enum session_events event)
change_state(peer, STATE_IDLE, event);
break;
case EVNT_TIMER_KEEPALIVE:
- start_timer_keepalive(peer);
session_keepalive(peer);
break;
case EVNT_RCVD_KEEPALIVE:
@@ -502,12 +500,11 @@ bgp_fsm(struct peer *peer, enum session_events event)
start_timer_holdtime(peer);
break;
case EVNT_RCVD_UPDATE:
- /* faaaaar later */
start_timer_holdtime(peer);
if (parse_update(peer))
change_state(peer, STATE_IDLE, event);
else
- start_timer_keepalive(peer);
+ start_timer_holdtime(peer);
break;
case EVNT_RCVD_NOTIFICATION:
parse_notification(peer);