rework timers.

stop changing tienmr values directly, always use new
timer_(get/set/stop/running) functions. preparation for more to come :)
ok claudio

1 files changed, 54 insertions, 62 deletions

diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index 49b8d3f3289..c80a1b0f4a5 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: session.c,v 1.276 2007/06/19 09:44:55 pyr Exp $ */
+/*	$OpenBSD: session.c,v 1.277 2007/12/20 17:08:48 henning Exp $ */
 
 /*
  * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -56,7 +56,6 @@ void	session_sighdlr(int);
 int	setup_listeners(u_int *);
 void	init_conf(struct bgpd_config *);
 void	init_peer(struct peer *);
-int	timer_due(time_t);
 void	start_timer_holdtime(struct peer *);
 void	start_timer_keepalive(struct peer *);
 void	session_close_connection(struct peer *);
@@ -305,7 +304,7 @@ session_main(struct bgpd_config *config, struct peer *cpeers,
 				/* reinit due? */
 				if (p->conf.reconf_action == RECONF_REINIT) {
 					bgp_fsm(p, EVNT_STOP);
-					p->IdleHoldTimer = time(NULL);
+					timer_set(p, Timer_IdleHold, 0);
 				}
 
 				/* deletion due? */
@@ -410,28 +409,28 @@ session_main(struct bgpd_config *config, struct peer *cpeers,
 
 		for (p = peers; p != NULL; p = p->next) {
 			/* check timers */
-			if (timer_due(p->HoldTimer))
+			if (timer_due(p, Timer_Hold))
 				bgp_fsm(p, EVNT_TIMER_HOLDTIME);
-			if (timer_due(p->ConnectRetryTimer))
+			if (timer_due(p, Timer_ConnectRetry))
 				bgp_fsm(p, EVNT_TIMER_CONNRETRY);
-			if (timer_due(p->KeepaliveTimer))
+			if (timer_due(p, Timer_Keepalive))
 				bgp_fsm(p, EVNT_TIMER_KEEPALIVE);
-			if (timer_due(p->IdleHoldTimer))
+			if (timer_due(p, Timer_IdleHold))
 				bgp_fsm(p, EVNT_START);
-			if (timer_due(p->IdleHoldResetTimer)) {
+			if (timer_due(p, Timer_IdleHoldReset)) {
 				p->IdleHoldTime /= 2;
 				if (p->IdleHoldTime <=
 				    INTERVAL_IDLE_HOLD_INITIAL) {
 					p->IdleHoldTime =
 					    INTERVAL_IDLE_HOLD_INITIAL;
-					p->IdleHoldResetTimer = 0;
+					timer_stop(p, Timer_IdleHoldReset);
 					p->errcnt = 0;
 				} else
-					p->IdleHoldResetTimer =
-					    time(NULL) + p->IdleHoldTime;
+					timer_set(p, Timer_IdleHoldReset,
+					    p->IdleHoldTime);
 			}
 
-			/* set nextaction to the first expiring timer */
+			/* XXX set nextaction to the first expiring timer */
 			if (p->ConnectRetryTimer &&
 			    p->ConnectRetryTimer < nextaction)
 				nextaction = p->ConnectRetryTimer;
@@ -445,7 +444,7 @@ session_main(struct bgpd_config *config, struct peer *cpeers,
 			    p->IdleHoldResetTimer < nextaction)
 				nextaction = p->IdleHoldResetTimer;
 
-			/* carp demotion */
+			/* XXX carp demotion */
 			if (p->demoted && p->state == STATE_ESTABLISHED) {
 				if (time(NULL) - p->stats.last_updown >=
 				    INTERVAL_HOLD_DEMOTED)
@@ -611,9 +610,9 @@ init_peer(struct peer *p)
 
 	change_state(p, STATE_IDLE, EVNT_NONE);
 	if (p->conf.down)
-		p->IdleHoldTimer = 0;		/* no autostart */
+		timer_stop(p, Timer_IdleHold);		/* no autostart */
 	else
-		p->IdleHoldTimer = time(NULL);	/* start ASAP */
+		timer_set(p, Timer_IdleHold, 0);	/* start ASAP */
 
 	/*
 	 * on startup, demote if requested.
@@ -634,9 +633,9 @@ bgp_fsm(struct peer *peer, enum session_events event)
 	case STATE_IDLE:
 		switch (event) {
 		case EVNT_START:
-			peer->HoldTimer = 0;
-			peer->KeepaliveTimer = 0;
-			peer->IdleHoldTimer = 0;
+			timer_stop(peer, Timer_Hold);
+			timer_stop(peer, Timer_Keepalive);
+			timer_stop(peer, Timer_IdleHold);
 
 			/* allocate read buffer */
 			peer->rbuf = calloc(1, sizeof(struct buf_read));
@@ -659,15 +658,15 @@ bgp_fsm(struct peer *peer, enum session_events event)
 			peer->stats.last_sent_suberr = 0;
 
 			if (!peer->depend_ok)
-				peer->ConnectRetryTimer = 0;
+				timer_stop(peer, Timer_ConnectRetry);
 			else if (peer->passive || peer->conf.passive ||
 			    peer->conf.template) {
 				change_state(peer, STATE_ACTIVE, event);
-				peer->ConnectRetryTimer = 0;
+				timer_stop(peer, Timer_ConnectRetry);
 			} else {
 				change_state(peer, STATE_CONNECT, event);
-				peer->ConnectRetryTimer =
-				    time(NULL) + INTERVAL_CONNECTRETRY;
+				timer_set(peer, Timer_ConnectRetry,
+				    INTERVAL_CONNECTRETRY);
 				session_connect(peer);
 			}
 			peer->passive = 0;
@@ -685,20 +684,20 @@ bgp_fsm(struct peer *peer, enum session_events event)
 		case EVNT_CON_OPEN:
 			session_tcp_established(peer);
 			session_open(peer);
-			peer->ConnectRetryTimer = 0;
+			timer_stop(peer, Timer_ConnectRetry);
 			peer->holdtime = INTERVAL_HOLD_INITIAL;
 			start_timer_holdtime(peer);
 			change_state(peer, STATE_OPENSENT, event);
 			break;
 		case EVNT_CON_OPENFAIL:
-			peer->ConnectRetryTimer =
-			    time(NULL) + INTERVAL_CONNECTRETRY;
+			timer_set(peer, Timer_ConnectRetry,
+			    INTERVAL_CONNECTRETRY);
 			session_close_connection(peer);
 			change_state(peer, STATE_ACTIVE, event);
 			break;
 		case EVNT_TIMER_CONNRETRY:
-			peer->ConnectRetryTimer =
-			    time(NULL) + INTERVAL_CONNECTRETRY;
+			timer_set(peer, Timer_ConnectRetry,
+			    INTERVAL_CONNECTRETRY);
 			session_connect(peer);
 			break;
 		default:
@@ -714,20 +713,20 @@ bgp_fsm(struct peer *peer, enum session_events event)
 		case EVNT_CON_OPEN:
 			session_tcp_established(peer);
 			session_open(peer);
-			peer->ConnectRetryTimer = 0;
+			timer_stop(peer, Timer_ConnectRetry);
 			peer->holdtime = INTERVAL_HOLD_INITIAL;
 			start_timer_holdtime(peer);
 			change_state(peer, STATE_OPENSENT, event);
 			break;
 		case EVNT_CON_OPENFAIL:
-			peer->ConnectRetryTimer =
-			    time(NULL) + INTERVAL_CONNECTRETRY;
+			timer_set(peer, Timer_ConnectRetry,
+			    INTERVAL_CONNECTRETRY);
 			session_close_connection(peer);
 			change_state(peer, STATE_ACTIVE, event);
 			break;
 		case EVNT_TIMER_CONNRETRY:
-			peer->ConnectRetryTimer =
-			    time(NULL) + peer->holdtime;
+			timer_set(peer, Timer_ConnectRetry,
+			    peer->holdtime);
 			change_state(peer, STATE_CONNECT, event);
 			session_connect(peer);
 			break;
@@ -747,8 +746,8 @@ bgp_fsm(struct peer *peer, enum session_events event)
 			break;
 		case EVNT_CON_CLOSED:
 			session_close_connection(peer);
-			peer->ConnectRetryTimer =
-			    time(NULL) + INTERVAL_CONNECTRETRY;
+			timer_set(peer, Timer_ConnectRetry,
+			    INTERVAL_CONNECTRETRY);
 			change_state(peer, STATE_ACTIVE, event);
 			break;
 		case EVNT_CON_FATAL:
@@ -770,7 +769,7 @@ bgp_fsm(struct peer *peer, enum session_events event)
 			if (parse_notification(peer)) {
 				change_state(peer, STATE_IDLE, event);
 				/* don't punish, capa negotiation */
-				peer->IdleHoldTimer = time(NULL);
+				timer_set(peer, Timer_IdleHold, 0);
 				peer->IdleHoldTime /= 2;
 			} else
 				change_state(peer, STATE_IDLE, event);
@@ -860,30 +859,22 @@ bgp_fsm(struct peer *peer, enum session_events event)
 	}
 }
 
-int
-timer_due(time_t timer)
-{
-	if (timer > 0 && timer <= time(NULL))
-		return (1);
-	return (0);
-}
-
 void
 start_timer_holdtime(struct peer *peer)
 {
 	if (peer->holdtime > 0)
-		peer->HoldTimer = time(NULL) + peer->holdtime;
+		timer_set(peer, Timer_Hold, peer->holdtime);
 	else
-		peer->HoldTimer = 0;
+		timer_stop(peer, Timer_Hold);
 }
 
 void
 start_timer_keepalive(struct peer *peer)
 {
 	if (peer->holdtime > 0)
-		peer->KeepaliveTimer = time(NULL) + peer->holdtime / 3;
+		timer_set(peer, Timer_Keepalive, peer->holdtime / 3);
 	else
-		peer->KeepaliveTimer = 0;
+		timer_stop(peer, Timer_Keepalive);
 }
 
 void
@@ -924,10 +915,10 @@ change_state(struct peer *peer, enum session_state state,
 		if (peer->IdleHoldTime == 0)
 			peer->IdleHoldTime = INTERVAL_IDLE_HOLD_INITIAL;
 		peer->holdtime = INTERVAL_HOLD_INITIAL;
-		peer->ConnectRetryTimer = 0;
-		peer->KeepaliveTimer = 0;
-		peer->HoldTimer = 0;
-		peer->IdleHoldResetTimer = 0;
+		timer_stop(peer, Timer_ConnectRetry);
+		timer_stop(peer, Timer_Keepalive);
+		timer_stop(peer, Timer_Hold);
+		timer_stop(peer, Timer_IdleHoldReset);
 		session_close_connection(peer);
 		msgbuf_clear(&peer->wbuf);
 		free(peer->rbuf);
@@ -936,7 +927,7 @@ change_state(struct peer *peer, enum session_state state,
 		if (peer->state == STATE_ESTABLISHED)
 			session_down(peer);
 		if (event != EVNT_STOP) {
-			peer->IdleHoldTimer = time(NULL) + peer->IdleHoldTime;
+			timer_set(peer, Timer_IdleHold, peer->IdleHoldTime);
 			if (event != EVNT_NONE &&
 			    peer->IdleHoldTime < MAX_IDLE_HOLD/2)
 				peer->IdleHoldTime *= 2;
@@ -959,7 +950,7 @@ change_state(struct peer *peer, enum session_state state,
 	case STATE_OPENCONFIRM:
 		break;
 	case STATE_ESTABLISHED:
-		peer->IdleHoldResetTimer = time(NULL) + peer->IdleHoldTime;
+		timer_set(peer, Timer_IdleHoldReset, peer->IdleHoldTime);
 		session_up(peer);
 		break;
 	default:		/* something seriously fucked */
@@ -1000,11 +991,13 @@ session_accept(int listenfd)
 
 	p = getpeerbyip((struct sockaddr *)&cliaddr);
 
-	if (p != NULL && p->state == STATE_IDLE && p->errcnt < 2 &&
-	    p->IdleHoldTimer > 0) {
-		/* fast reconnect after clear */
-		p->passive = 1;
-		bgp_fsm(p, EVNT_START);
+	if (p != NULL && p->state == STATE_IDLE && p->errcnt < 2) {
+		time_t	*t = timer_get(p, Timer_IdleHold);
+		if (*t > 0) {
+			/* fast reconnect after clear */
+			p->passive = 1;
+			bgp_fsm(p, EVNT_START);
+		}
 	}
 
 	if (p != NULL &&
@@ -1972,7 +1965,7 @@ parse_open(struct peer *peer)
 			session_notification(peer, ERR_OPEN, ERR_OPEN_OPT,
 				NULL, 0);
 			change_state(peer, STATE_IDLE, EVNT_RCVD_OPEN);
-			peer->IdleHoldTimer = time(NULL);	/* no punish */
+			timer_set(peer, Timer_IdleHold, 0);	/* no punish */
 			peer->IdleHoldTime /= 2;
 			return (-1);
 		}
@@ -2532,9 +2525,8 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx, u_int *listener_cnt)
 				case ERR_CEASE_MAX_PREFIX:
 					bgp_fsm(p, EVNT_STOP);
 					if (p->conf.max_prefix_restart)
-						p->IdleHoldTimer =
-						    time(NULL) + 60 *
-						    p->conf.max_prefix_restart;
+						timer_set(p, Timer_IdleHold, 60 *
+						    p->conf.max_prefix_restart);
 					break;
 				default:
 					bgp_fsm(p, EVNT_CON_FATAL);