diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-02-09 16:08:07 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2005-02-09 16:08:07 +0000 |
| commit | d0f9dc172fb82a45b5f291511ab80065e2ff4c15 (patch) | |
| tree | 0f218cf3934d6c68f772f35d0554b8ed645720ca /usr.sbin | |
| parent | 8b5c254b9d08d53a836b698bb1fc3fef26ab7380 (diff) | |
Prevent the ADJ_TMOUT from complaining about an unexpected event.
From norby@
Diffstat (limited to 'usr.sbin')
| -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); } |