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

Bugfix in (B)DR election.

Browse source
This commit is contained in:
Ondrej Filip 2000-05-10 23:41:52 +00:00
parent ff73f1d63d
commit 74ac7cdb1a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
proto/ospf/neighbor.c
View file

@ -316,12 +316,12 @@ bdr_election(struct ospf_iface *ifa, struct proto *p)
nbdr=electbdr(ifa->neigh_list); nbdr=electbdr(ifa->neigh_list);
ndr=electdr(ifa->neigh_list); ndr=electdr(ifa->neigh_list);
if(ndr==NULL) ndr=nbdr; if(ndr==NULL) ndr=nbdr; /* FIXME is this correct? */
if(((ifa->drid==myid) && (ndr->rid!=myid)) if(((ifa->drid==myid) && (ndr!=&me))
|| ((ifa->drid!=myid) && (ndr->rid==myid)) || ((ifa->drid!=myid) && (ndr==&me))
|| ((ifa->bdrid==myid) && (nbdr->rid!=myid)) || ((ifa->bdrid==myid) && (nbdr!=&me))
|| ((ifa->bdrid!=myid) && (nbdr->rid==myid))) || ((ifa->bdrid!=myid) && (nbdr==&me)))
{ {
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;