summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Filip <feela@network.cz>2000-05-10 13:35:49 +0000
committerOndrej Filip <feela@network.cz>2000-05-10 13:35:49 +0000
commita3f657ac764ff38a5829f27a0dccbf6220043a1a (patch)
tree8dacc3348575b3d54cd149f2a2becda1cd338c3a
parent3e474192745e7e92d27cad7ffa16a8395e884cf2 (diff)
Ever test possibility of forming of adjacency.
-rw-r--r--proto/ospf/neighbor.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 78bba618..479b0f8a 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -225,15 +225,9 @@ ospf_neigh_sm(struct ospf_neighbor *n, int event)
}
break;
case INM_2WAYREC:
- if(n->state<NEIGHBOR_2WAY)
- {
- /* Can In build adjacency? */
- neigh_chstate(n,NEIGHBOR_2WAY);
- if(can_do_adj(n))
- {
- neigh_chstate(n,NEIGHBOR_EXSTART);
- }
- }
+ if(n->state<NEIGHBOR_2WAY) neigh_chstate(n,NEIGHBOR_2WAY);
+ if((n->state==NEIGHBOR_2WAY) && can_do_adj(n))
+ neigh_chstate(n,NEIGHBOR_EXSTART);
break;
case INM_NEGDONE:
if(n->state==NEIGHBOR_EXSTART)
@@ -261,7 +255,7 @@ ospf_neigh_sm(struct ospf_neighbor *n, int event)
switch(n->state)
{
case NEIGHBOR_2WAY:
- /* Can In build adjacency? */
+ /* Can In build adjacency? */
if(can_do_adj(n))
{
neigh_chstate(n,NEIGHBOR_EXSTART);