diff options
| author |   claudio <claudio@openbsd.org> | 2005-02-09 16:08:06 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2005-02-09 16:08:06 +0000 |
| commit | f71e573acc43f6d02bfb4f17f3ab12e2feebeefb (patch) | |
| tree | 35c00c09ce45b48f831fdfb243b9935fcfbc0944 | |
| parent | Fix the restart DD case. In case of a timeout recheck the adjacency and go (diff) | |
| download | wireguard-openbsd-f71e573acc43f6d02bfb4f17f3ab12e2feebeefb.tar.xz wireguard-openbsd-f71e573acc43f6d02bfb4f17f3ab12e2feebeefb.zip | |
Prevent the ADJ_TMOUT from complaining about an unexpected event.
From norby@
| -rw-r--r-- | usr.sbin/ospfd/neighbor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/ospfd/neighbor.c b/usr.sbin/ospfd/neighbor.c index c9c1e88b3c3..aa15490b327 100644 --- a/usr.sbin/ospfd/neighbor.c +++ b/usr.sbin/ospfd/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.6 2005/02/09 15:57:57 claudio Exp $ */ +/* $OpenBSD: neighbor.c,v 1.7 2005/02/09 16:08:06 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -396,7 +396,7 @@ nbr_adj_timer(int fd, short event, void *arg) { struct nbr *nbr = arg; - if (nbr->state != NBR_STA_FULL) { + if (nbr->state & NBR_STA_ACTIVE && nbr->state != NBR_STA_FULL) { log_debug("nbr_adj_timer: failed to form adjacency"); nbr_fsm(nbr, NBR_EVT_ADJTMOUT); } |