diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-03-22 14:26:36 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-03-22 14:26:36 +0000 |
| commit | 753731046d512a341ff1787c36b9bbb88f92a830 (patch) | |
| tree | b6a9a62f820793482b19b8cacd6cf44933abaec1 /usr.sbin | |
| parent | 65e3942ce01a99ce492ca3e1197a0d57c38d69a5 (diff) | |
port from ospfd/lsreq.c r1.20, ok claudio@
date: 2013/01/17 09:02:22; author: markus; state: Exp; lines: +4 -2
the peer might still send more DD messages, even if the RDE has
processed all received DDs (dd_pending == 0), so we need to check
for state != NBR_STA_XCHNG; ok claudio@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/ospf6d/lsreq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/ospf6d/lsreq.c b/usr.sbin/ospf6d/lsreq.c index fa416639f95..af5ee550561 100644 --- a/usr.sbin/ospf6d/lsreq.c +++ b/usr.sbin/ospf6d/lsreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lsreq.c,v 1.7 2011/05/02 08:56:44 claudio Exp $ */ +/* $OpenBSD: lsreq.c,v 1.8 2013/03/22 14:26:35 sthen Exp $ */ /* * Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org> @@ -160,7 +160,9 @@ ls_req_list_free(struct nbr *nbr, struct lsa_entry *le) start_ls_req_tx_timer(nbr); } - if (ls_req_list_empty(nbr) && nbr->dd_pending == 0) + /* we might not have received all DDs and are still in XCHNG */ + if (ls_req_list_empty(nbr) && nbr->dd_pending == 0 && + nbr->state != NBR_STA_XCHNG) nbr_fsm(nbr, NBR_EVT_LOAD_DONE); } |