From b1f7229ad7d0b10fcc1fde6645c8b8ebbb3644a6 Mon Sep 17 00:00:00 2001 From: Ondrej Filip Date: Fri, 11 Jun 2004 09:34:48 +0000 Subject: Better adjacency building, some minor bugfixes. --- proto/ospf/neighbor.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'proto/ospf/neighbor.c') diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c index 4f69638..5abaf48 100644 --- a/proto/ospf/neighbor.c +++ b/proto/ospf/neighbor.c @@ -605,14 +605,24 @@ rxmt_timer_hook(timer * timer) DBG("%s: RXMT timer fired on interface %s for neigh: %I.\n", p->name, ifa->iface->name, n->ip); - if (n->state < NEIGHBOR_LOADING) + + if(n->state < NEIGHBOR_EXSTART) return; + + if (n->state == NEIGHBOR_EXSTART) + { ospf_dbdes_send(n); + return; + } + + if ((n->state == NEIGHBOR_EXCHANGE) && n->myimms.bit.ms) /* I'm master */ + ospf_dbdes_send(n); + - if (n->state < NEIGHBOR_FULL) - ospf_lsreq_send(n); + if (n->state < NEIGHBOR_FULL) + ospf_lsreq_send(n); /* EXCHANGE or LOADING */ else { - if (!EMPTY_SLIST(n->lsrtl)) + if (!EMPTY_SLIST(n->lsrtl)) /* FULL */ { list uplist; slab *upslab; -- cgit v1.2.3