summaryrefslogtreecommitdiffstats
path: root/proto/ospf/neighbor.c
diff options
context:
space:
mode:
authorOndrej Filip <feela@network.cz>2003-08-23 12:47:46 +0200
committerOndrej Filip <feela@network.cz>2003-08-23 12:47:46 +0200
commit1d1a3c1c2a72ef91b785f5ed08ca5ab3f001b14e (patch)
tree708157146b4842c499e9d9bb7ecda99149f93df5 /proto/ospf/neighbor.c
parentbaa5dd6ccc14eb6bc43fad37a2bfe88ad190c0fa (diff)
downloadbird-1d1a3c1c2a72ef91b785f5ed08ca5ab3f001b14e.tar
bird-1d1a3c1c2a72ef91b785f5ed08ca5ab3f001b14e.zip
Minor OSPF changes for faster startup.
Diffstat (limited to 'proto/ospf/neighbor.c')
-rw-r--r--proto/ospf/neighbor.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index bc4d1c3..d9c9b1b 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -67,11 +67,6 @@ neigh_chstate(struct ospf_neighbor *n, u8 state)
schedule_rt_lsa(ifa->oa);
schedule_net_lsa(ifa);
}
- if(oldstate>=NEIGHBOR_EXSTART && state<NEIGHBOR_EXSTART)
- {
- /* Stop RXMT timer */
- tm_stop(n->rxmt_timer);
- }
if(state==NEIGHBOR_EXSTART)
{
if(n->adj==0) /* First time adjacency */
@@ -86,6 +81,8 @@ neigh_chstate(struct ospf_neighbor *n, u8 state)
tm_start(n->rxmt_timer,1); /* Or some other number ? */
}
if(state<NEIGHBOR_EXCHANGE) tm_stop(n->lsrr_timer);
+ if(state<NEIGHBOR_EXSTART) tm_stop(n->rxmt_timer);
+ if(state>NEIGHBOR_EXSTART) n->myimms.bit.i=0;
}
}