Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bug in election fixed.

Browse source
This commit is contained in:
Ondrej Filip 1999-08-09 18:11:51 +00:00
parent e83dc0d7e7
commit b1693b8f74
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
proto/ospf/ospf.c
View file

@ -149,6 +149,9 @@ backupseen(struct ospf_iface *ifa)
p=(struct proto *)(ifa->proto); p=(struct proto *)(ifa->proto);
tm_stop(ifa->wait_timer);
DBG("%s: Stoping wait timer\n",p->name);
DBG("%s: (B)DR election.\n",p->name); DBG("%s: (B)DR election.\n",p->name);
myid=p->cf->global->router_id; myid=p->cf->global->router_id;
@ -166,10 +169,10 @@ backupseen(struct ospf_iface *ifa)
if(ndr==NULL) ndr=nbdr; if(ndr==NULL) ndr=nbdr;
if(((ifa->drid==myid) && (ndr!=myid)) if(((ifa->drid==myid) && (ndr->rid!=myid))
|| ((ifa->drid!=myid) && (ndr==myid)) || ((ifa->drid!=myid) && (ndr->rid==myid))
|| ((ifa->bdrid==myid) && (nbdr!=myid)) || ((ifa->bdrid==myid) && (nbdr->rid!=myid))
|| ((ifa->bdrid!=myid) && (nbdr==myid))) || ((ifa->bdrid!=myid) && (nbdr->rid==myid)))
{ {
if(ndr==NULL) ifa->drid=me.dr=0; if(ndr==NULL) ifa->drid=me.dr=0;
else ifa->drid=me.dr=ndr->rid; else ifa->drid=me.dr=ndr->rid;
@ -188,9 +191,6 @@ backupseen(struct ospf_iface *ifa)
DBG("%s: DR=%u, BDR=%u\n",p->name, ifa->drid, ifa->bdrid); DBG("%s: DR=%u, BDR=%u\n",p->name, ifa->drid, ifa->bdrid);
tm_stop(ifa->wait_timer);
DBG("%s: Stoping wait timer\n",p->name);
if(myid==ifa->drid) iface_chstate(ifa, OSPF_IS_DR); if(myid==ifa->drid) iface_chstate(ifa, OSPF_IS_DR);
else else
{ {