summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Filip <feela@network.cz>2000-05-09 13:27:31 +0200
committerOndrej Filip <feela@network.cz>2000-05-09 13:27:31 +0200
commitb29c620f90d429b868038984a5427470f00aebac (patch)
tree434ab20cff21348474dd444499a1844606f9c252
parent279a3b76d193944431a992a1ac43543fe15ab903 (diff)
downloadbird-b29c620f90d429b868038984a5427470f00aebac.tar
bird-b29c620f90d429b868038984a5427470f00aebac.zip
Another bugfix in neighbor state machine.
-rw-r--r--proto/ospf/hello.c57
-rw-r--r--proto/ospf/neighbor.c10
-rw-r--r--proto/ospf/topology.c4
3 files changed, 30 insertions, 41 deletions
diff --git a/proto/ospf/hello.c b/proto/ospf/hello.c
index 2d1cdaa..74ae43a 100644
--- a/proto/ospf/hello.c
+++ b/proto/ospf/hello.c
@@ -52,7 +52,8 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p,
{
u32 nrid, *pnrid;
struct ospf_neighbor *neigh,*n;
- u8 i,twoway;
+ u8 i,twoway,oldpriority;
+ u32 olddr,oldbdr;
char *beg=": Bad OSPF hello packet from ", *rec=" received: ";
nrid=ntohl(((struct ospf_packet *)ps)->routerid);
@@ -136,42 +137,34 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p,
if(!twoway) ospf_neigh_sm(n, INM_1WAYREC);
+ olddr = n->dr;
+ n->dr = ntohl(ps->dr);
+ oldbdr = n->bdr;
+ n->bdr = ntohl(ps->bdr);
+ oldpriority = n->priority;
+ n->priority = ps->priority;
+
/* Check priority change */
- if(n->priority!=(n->priority=ps->priority))
+ if(n->state>=NEIGHBOR_2WAY)
{
- ospf_int_sm(ifa, ISM_NEICH);
- }
+ if(n->priority!=oldpriority) ospf_int_sm(ifa, ISM_NEICH);
- /* Check neighbor's designed router idea */
- if((n->rid!=ntohl(ps->dr)) && (ntohl(ps->bdr)==0) &&
- (n->state>=NEIGHBOR_2WAY))
- {
- ospf_int_sm(ifa, ISM_BACKS);
- }
- if((n->rid==ntohl(ps->dr)) && (n->dr!=ntohl(ps->dr)))
- {
- ospf_int_sm(ifa, ISM_NEICH);
- }
- if((n->rid==n->dr) && (n->dr!=ntohl(ps->dr)))
- {
- ospf_int_sm(ifa, ISM_NEICH);
- }
- n->dr=ntohl(ps->dr); /* And update it */
+ /* Router is declaring itself ad DR and there is no BDR */
+ if((n->rid==n->dr) && (n->bdr==0)) ospf_int_sm(ifa, ISM_BACKS);
- /* Check neighbor's backup designed router idea */
- if((n->rid==ntohl(ps->bdr)) && (n->state>=NEIGHBOR_2WAY))
- {
- ospf_int_sm(ifa, ISM_BACKS);
- }
- if((n->rid==ntohl(ps->bdr)) && (n->bdr!=ntohl(ps->bdr)))
- {
- ospf_int_sm(ifa, ISM_NEICH);
- }
- if((n->rid==n->bdr) && (n->bdr!=ntohl(ps->bdr)))
- {
- ospf_int_sm(ifa, ISM_NEICH);
+ /* Neighbor is declaring itself as BDR */
+ if(n->rid==n->bdr) ospf_int_sm(ifa, ISM_BACKS);
+
+ /* Neighbor is newly declaring itself as DR or BDR */
+ if(((n->rid==n->dr) && (n->dr!=olddr)) || ((n->rid==n->bdr) &&
+ (n->bdr!=oldbdr)))
+ ospf_int_sm(ifa, ISM_NEICH);
+
+ /* Neighbor is no more declaring itself as DR or BDR */
+ if(((n->rid==olddr) && (n->dr!=olddr)) || ((n->rid==olbddr) &&
+ (n->dr!=oldbdr)))
+ ospf_int_sm(ifa, ISM_NEICH);
}
- n->bdr=ntohl(ps->bdr); /* And update it */
ospf_neigh_sm(n, INM_HELLOREC);
}
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 317da36..466c7ad 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -29,6 +29,8 @@ neigh_chstate(struct ospf_neighbor *n, u8 state)
{
ifa=n->ifa;
n->state=state;
+ if(state==2WAY && oldstate<2WAY) ospf_int_sm(n->ifa, ISM_NEICH);
+ if(state<2WAY && oldstate>=2WAY) ospf_int_sm(n->ifa, ISM_NEICH);
if(oldstate==NEIGHBOR_FULL) /* Decrease number of adjacencies */
{
ifa->fadj--;
@@ -227,7 +229,6 @@ ospf_neigh_sm(struct ospf_neighbor *n, int event)
{
neigh_chstate(n,NEIGHBOR_EXSTART);
}
- ospf_int_sm(n->ifa, ISM_NEICH);
}
break;
case INM_NEGDONE:
@@ -283,14 +284,9 @@ ospf_neigh_sm(struct ospf_neighbor *n, int event)
case INM_LLDOWN:
case INM_INACTTIM:
neigh_chstate(n,NEIGHBOR_DOWN);
- ospf_int_sm(n->ifa, ISM_NEICH);
break;
case INM_1WAYREC:
- if(n->state>=NEIGHBOR_2WAY)
- {
- neigh_chstate(n,NEIGHBOR_INIT);
- ospf_int_sm(n->ifa, ISM_NEICH);
- }
+ neigh_chstate(n,NEIGHBOR_INIT);
break;
default:
die("%s: INM - Unknown event?",p->name);
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 4a41e32..81d9578 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -284,11 +284,11 @@ originate_net_lsa(struct ospf_iface *ifa, struct proto_ospf *po)
struct top_hash_entry *en;
void *body;
- DBG("%s: Originating Net lsa for iface \"%s\".\n", po->proto.name, ifa->iface->name);
- DBG("%s: State is:\"%u\" Fadj=%u.\n", po->proto.name, ifa->state,ifa->fadj);
if(ifa->state!=OSPF_IS_DR) return;
+ DBG("%s: Originating Net lsa for iface \"%s\".\n", po->proto.name, ifa->iface->name);
+
if(ifa->fadj==0)
{
if(ifa->nlsa==NULL) return;