1 files changed, 28 insertions, 13 deletions

diff --git a/ldpd/adjacency.c b/ldpd/adjacency.c
index 8659202ee4..52e2776654 100644
--- a/ldpd/adjacency.c
+++ b/ldpd/adjacency.c
@@ -29,6 +29,8 @@ static __inline int adj_compare(struct adj *, struct adj *);
 static int	 adj_itimer(struct thread *);
 static __inline int tnbr_compare(struct tnbr *, struct tnbr *);
 static void	 tnbr_del(struct ldpd_conf *, struct tnbr *);
+static void	 tnbr_start(struct tnbr *);
+static void	 tnbr_stop(struct tnbr *);
 static int	 tnbr_hello_timer(struct thread *);
 static void	 tnbr_start_hello_timer(struct tnbr *);
 static void	 tnbr_stop_hello_timer(struct tnbr *);
@@ -204,8 +206,9 @@ void
 adj_start_itimer(struct adj *adj)
 {
 	THREAD_TIMER_OFF(adj->inactivity_timer);
-	adj->inactivity_timer = thread_add_timer(master, adj_itimer, adj,
-	    adj->holdtime);
+	adj->inactivity_timer = NULL;
+	thread_add_timer(master, adj_itimer, adj, adj->holdtime,
+			 &adj->inactivity_timer);
 }
 
 void
@@ -245,9 +248,7 @@ tnbr_new(int af, union ldpd_addr *addr)
 static void
 tnbr_del(struct ldpd_conf *xconf, struct tnbr *tnbr)
 {
-	tnbr_stop_hello_timer(tnbr);
-	if (tnbr->adj)
-		adj_del(tnbr->adj, S_SHUTDOWN);
+	tnbr_stop(tnbr);
 	RB_REMOVE(tnbr_head, &xconf->tnbr_tree, tnbr);
 	free(tnbr);
 }
@@ -273,6 +274,23 @@ tnbr_check(struct ldpd_conf *xconf, struct tnbr *tnbr)
 	return (tnbr);
 }
 
+static void
+tnbr_start(struct tnbr *tnbr)
+{
+	send_hello(HELLO_TARGETED, NULL, tnbr);
+	tnbr_start_hello_timer(tnbr);
+	tnbr->state = TNBR_STA_ACTIVE;
+}
+
+static void
+tnbr_stop(struct tnbr *tnbr)
+{
+	tnbr_stop_hello_timer(tnbr);
+	if (tnbr->adj)
+		adj_del(tnbr->adj, S_SHUTDOWN);
+	tnbr->state = TNBR_STA_DOWN;
+}
+
 void
 tnbr_update(struct tnbr *tnbr)
 {
@@ -292,16 +310,12 @@ tnbr_update(struct tnbr *tnbr)
 		if (!socket_ok || !rtr_id_ok)
 			return;
 
-		tnbr->state = TNBR_STA_ACTIVE;
-		send_hello(HELLO_TARGETED, NULL, tnbr);
-
-		tnbr_start_hello_timer(tnbr);
+		tnbr_start(tnbr);
 	} else if (tnbr->state == TNBR_STA_ACTIVE) {
 		if (socket_ok && rtr_id_ok)
 			return;
 
-		tnbr->state = TNBR_STA_DOWN;
-		tnbr_stop_hello_timer(tnbr);
+		tnbr_stop(tnbr);
 	}
 }
 
@@ -353,8 +367,9 @@ static void
 tnbr_start_hello_timer(struct tnbr *tnbr)
 {
 	THREAD_TIMER_OFF(tnbr->hello_timer);
-	tnbr->hello_timer = thread_add_timer(master, tnbr_hello_timer, tnbr,
-	    tnbr_get_hello_interval(tnbr));
+	tnbr->hello_timer = NULL;
+	thread_add_timer(master, tnbr_hello_timer, tnbr, tnbr_get_hello_interval(tnbr),
+			 &tnbr->hello_timer);
 }
 
 static void