diff options
| author | Esben Norby <norby@cvs.openbsd.org> | 2006-02-19 19:23:18 +0000 |
|---|---|---|
| committer | Esben Norby <norby@cvs.openbsd.org> | 2006-02-19 19:23:18 +0000 |
| commit | 3bb3074e2aef4560bd81fa749ed29ad24041a67a (patch) | |
| tree | 57799b1b67d825150bbf752dce25d11f52ee3b45 /usr.sbin | |
| parent | 3e3444ff1ae070f10418ddd7ca4568e5f9c62f10 (diff) | |
Do not kick the adj_timer for neighbors that are in state 2-Way.
ok claudio@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ospfd/neighbor.c | 5 |
1 files changed, 4 insertions, 1 deletions
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 <claudio@openbsd.org> @@ -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)); |