diff options
| author |   claudio <claudio@openbsd.org> | 2006-02-02 20:46:34 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2006-02-02 20:46:34 +0000 |
| commit | 581e025556295751392fb80d1fabfd023ef12909 (patch) | |
| tree | 80afd3b0b0c6b7cdfba81414c40c3173c7d913cd | |
| parent | Optimize bge_rxeof() & bge_txeof(): return immediately if there are no packets (diff) | |
| download | wireguard-openbsd-581e025556295751392fb80d1fabfd023ef12909.tar.xz wireguard-openbsd-581e025556295751392fb80d1fabfd023ef12909.zip | |
Be less verbose about DR/BDR selection this seems to be rock solid now.
OK norby@
| -rw-r--r-- | usr.sbin/ospfd/hello.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/usr.sbin/ospfd/hello.c b/usr.sbin/ospfd/hello.c index 67d73d03a3d..7d8454eb38f 100644 --- a/usr.sbin/ospfd/hello.c +++ b/usr.sbin/ospfd/hello.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hello.c,v 1.11 2005/11/12 18:18:24 deraadt Exp $ */ +/* $OpenBSD: hello.c,v 1.12 2006/02/02 20:46:34 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -228,24 +228,18 @@ recv_hello(struct iface *iface, struct in_addr src, u_int32_t rtr_id, char *buf, } if (iface->state & IF_STA_WAITING && - hello.d_rtr == nbr->addr.s_addr && hello.bd_rtr == 0) { - log_debug("hello: DR seen with NO BDR"); + hello.d_rtr == nbr->addr.s_addr && hello.bd_rtr == 0) if_fsm(iface, IF_EVT_BACKUP_SEEN); - } if (iface->state & IF_STA_WAITING && hello.bd_rtr == nbr->addr.s_addr) { /* * In case we see the BDR make sure that the DR is around * with a bidirectional (2_WAY or better) connection */ - log_debug("hello: BDR seen"); LIST_FOREACH(dr, &iface->nbr_list, entry) if (hello.d_rtr == dr->addr.s_addr && - dr->state & NBR_STA_BIDIR) { - log_debug("hello: BDR seen & DR %s is BIDIR", - inet_ntoa(dr->addr)); + dr->state & NBR_STA_BIDIR) if_fsm(iface, IF_EVT_BACKUP_SEEN); - } } if ((nbr->addr.s_addr == nbr->dr.s_addr && |