From 3bb3074e2aef4560bd81fa749ed29ad24041a67a Mon Sep 17 00:00:00 2001 From: Esben Norby Date: Sun, 19 Feb 2006 19:23:18 +0000 Subject: Do not kick the adj_timer for neighbors that are in state 2-Way. ok claudio@ --- usr.sbin/ospfd/neighbor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'usr.sbin') diff --git a/usr.sbin/ospfd/neighbor.c b/usr.sbin/ospfd/neighbor.c index a84dbab2236..da9755dcea4 100644 --- a/usr.sbin/ospfd/neighbor.c +++ b/usr.sbin/ospfd/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.28 2006/02/19 18:55:47 norby Exp $ */ +/* $OpenBSD: neighbor.c,v 1.29 2006/02/19 19:23:17 norby Exp $ */ /* * Copyright (c) 2005 Claudio Jeker @@ -407,6 +407,9 @@ nbr_adj_timer(int fd, short event, void *arg) { struct nbr *nbr = arg; + if (nbr->state == NBR_STA_2_WAY) + return ; + if (nbr->state & NBR_STA_ACTIVE && nbr->state != NBR_STA_FULL) { log_warnx("nbr_adj_timer: failed to form adjacency with %s", inet_ntoa(nbr->id)); -- cgit v1.2.3