diff options
| author |   markus <markus@openbsd.org> | 2013-03-25 14:27:33 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2013-03-25 14:27:33 +0000 |
| commit | 8dc7367f5bcfdd50abed936969c4bef7e14f99e1 (patch) | |
| tree | 5f0218cfd7061daefc8dd087b3071e5c2d1a74a9 | |
| parent | sync w/ospfd: the event NBR_EVT_SEQ_NUM_MIS is not defined in state (diff) | |
| download | wireguard-openbsd-8dc7367f5bcfdd50abed936969c4bef7e14f99e1.tar.xz wireguard-openbsd-8dc7367f5bcfdd50abed936969c4bef7e14f99e1.zip | |
sync w/ospfd: ignore the nbr_adj_timer if we are not forming
adjacencies; ok claudio sthen
| -rw-r--r-- | usr.sbin/ospf6d/neighbor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/ospf6d/neighbor.c b/usr.sbin/ospf6d/neighbor.c index b4d0cfa7da9..3154bced219 100644 --- a/usr.sbin/ospf6d/neighbor.c +++ b/usr.sbin/ospf6d/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.11 2009/03/29 16:24:38 stsp Exp $ */ +/* $OpenBSD: neighbor.c,v 1.12 2013/03/25 14:27:33 markus Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -436,8 +436,8 @@ 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_ADJFORM)) + return; if (nbr->state & NBR_STA_ACTIVE && nbr->state != NBR_STA_FULL) { log_warnx("nbr_adj_timer: failed to form adjacency with %s", |