diff options
| author |   claudio <claudio@openbsd.org> | 2007-10-11 08:21:29 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2007-10-11 08:21:29 +0000 |
| commit | 4d267a96181b476a0e12ad8164fcf3bc3a0e8e7a (patch) | |
| tree | 55d67c462003286f04434f4962e2c7d03b07f3c0 /usr.sbin/ospfd/neighbor.c | |
| parent | pcc also knows about quads; ok cloder@ (diff) | |
| download | wireguard-openbsd-4d267a96181b476a0e12ad8164fcf3bc3a0e8e7a.tar.xz wireguard-openbsd-4d267a96181b476a0e12ad8164fcf3bc3a0e8e7a.zip | |
Do not overload nbr->options with the dd exchange bits. nbr->options is used
by the hello protocol. Instead add a dd_more flag that is used together with
(the renamed) dd_master flag.
Tested and OK norby@
Diffstat (limited to 'usr.sbin/ospfd/neighbor.c')
| -rw-r--r-- | usr.sbin/ospfd/neighbor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ospfd/neighbor.c b/usr.sbin/ospfd/neighbor.c index a89441ab14b..ce68f96e22a 100644 --- a/usr.sbin/ospfd/neighbor.c +++ b/usr.sbin/ospfd/neighbor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neighbor.c,v 1.35 2007/06/13 17:47:52 claudio Exp $ */ +/* $OpenBSD: neighbor.c,v 1.36 2007/10/11 08:21:29 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -276,7 +276,7 @@ nbr_new(u_int32_t nbr_id, struct iface *iface, int self) fatal("nbr_new"); nbr->state = NBR_STA_DOWN; - nbr->master = 1; + nbr->dd_master = 1; nbr->dd_seq_num = arc4random(); /* RFC: some unique value */ nbr->id.s_addr = nbr_id; @@ -502,7 +502,7 @@ nbr_act_eval(struct nbr *nbr) } nbr->state = NBR_STA_XSTRT; - nbr->master = 1; + nbr->dd_master = 1; nbr->dd_seq_num++; /* as per RFC */ nbr->dd_pending = 0; /* initial db negotiation */ @@ -526,7 +526,7 @@ nbr_act_snapshot(struct nbr *nbr) int nbr_act_exchange_done(struct nbr *nbr) { - if (nbr->master) + if (nbr->dd_master) stop_db_tx_timer(nbr); if (ls_req_list_empty(nbr) && nbr->state == NBR_STA_XCHNG && @@ -568,7 +568,7 @@ nbr_act_restart_dd(struct nbr *nbr) } nbr->state = NBR_STA_XSTRT; - nbr->master = 1; + nbr->dd_master = 1; nbr->dd_seq_num += arc4random() & 0xffff; nbr->dd_pending = 0; |