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

Calculation of external routes finally works.

Browse source
This commit is contained in:
Ondrej Filip 2000-05-16 23:24:50 +00:00
parent 31834faaf3
commit 8fb0c2c298
1 changed files with 32 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
proto/ospf/rt.c
View file

@ -256,8 +256,10 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
struct ospf_lsa_ext *le; struct ospf_lsa_ext *le;
struct ospf_lsa_ext_tos *lt; struct ospf_lsa_ext_tos *lt;
int mlen; int mlen;
ip_addr ip; ip_addr ip,nnh;
struct iface *nnhi=NULL;
u16 met,met2; u16 met,met2;
neighbor *nn;
debug("%s: Starting routing table calculation for external routes\n", debug("%s: Starting routing table calculation for external routes\n",
p->name); p->name);
@ -306,6 +308,7 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
absr=NULL; absr=NULL;
absroa=NULL; absroa=NULL;
nnhi=NULL;
met=0;met2=0; met=0;met2=0;
@ -358,6 +361,13 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
met=nf->metric+lt->metric; met=nf->metric+lt->metric;
met2=0; met2=0;
} }
if((nn=neigh_find(p,&lt->fwaddr,0))!=NULL)
{
nnh=nn->addr;
nnhi=nn->iface;
}
} }
nf=fib_get(ef,&ip, mlen); nf=fib_get(ef,&ip, mlen);
@ -365,24 +375,31 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
{ {
nf->metric=met; nf->metric=met;
nf->metric2=met2; nf->metric2=met2;
if(absr->nhi==NULL) if(nnhi!=NULL)
{ {
struct ospf_neighbor *neigh; nf->nh=nnh;
neighbor *nn; nf->nhi=nnhi;
if((neigh=find_neigh_noifa(po,absr->lsa.rt))==NULL)
{
continue;
}
nn=neigh_find(p,&neigh->ip,0);
DBG(" Next hop calculated: %I\n", nn->addr);
nf->nh=nn->addr;
nf->nhi=nn->iface;
} }
else else
{ {
nf->nh=absr->nh; if(absr->nhi==NULL)
nf->nhi=absr->nhi; {
struct ospf_neighbor *neigh;
if((neigh=find_neigh_noifa(po,absr->lsa.rt))==NULL)
{
continue;
}
nn=neigh_find(p,&neigh->ip,0);
DBG(" Next hop calculated: %I\n", nn->addr);
nf->nh=nn->addr;
nf->nhi=nn->iface;
}
else
{
nf->nh=absr->nh;
nf->nhi=absr->nhi;
}
} }
} }
} }