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

Calculation of external routes works. :-)

Browse source
This commit is contained in:
Ondrej Filip 2000-05-12 00:22:43 +00:00
parent be2bb40341
commit 7e681ef360
1 changed files with 28 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
proto/ospf/rt.c
View file

@ -173,22 +173,9 @@ again:
if(nf->metric==LSINFINITY) if(nf->metric==LSINFINITY)
{ {
net *ne; net *ne;
rta a0;
struct top_hash_entry *en=nf->en; struct top_hash_entry *en=nf->en;
ln=en->lsa_body; ln=en->lsa_body;
bzero(&a0, sizeof(a0));
a0.proto=p;
a0.source=RTS_OSPF;
a0.scope=SCOPE_UNIVERSE; /* What's this good for? */
a0.cast=RTC_UNICAST;
a0.dest=RTD_ROUTER;
a0.flags=0;
a0.aflags=0;
a0.iface=en->nhi;
a0.gw=en->nh;
a0.from=en->nh; /* FIXME Just a test */
ne=net_get(p->table, nf->fn.prefix, nf->fn.pxlen); ne=net_get(p->table, nf->fn.prefix, nf->fn.pxlen);
DBG("Deleting rt entry %I\n (IP: %I, GW: %I, Iface: %s)\n", DBG("Deleting rt entry %I\n (IP: %I, GW: %I, Iface: %s)\n",
nf->fn.prefix,ip,en->nh,en->nhi->name); nf->fn.prefix,ip,en->nh,en->nhi->name);
@ -254,15 +241,16 @@ again:
} }
skip: skip:
FIB_ITERATE_END(nftmp); FIB_ITERATE_END(nftmp);
ospf_ext_spfa(po);
} }
void void
ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
{ {
struct top_hash_entry *en,*etmp,*absr; struct top_hash_entry *en,*etmp,*absr;
struct fib *in=&po->efib; struct fib *ef=&po->efib;
struct extfib *nf; struct extfib *nf;
struct fib_iterator efit; struct fib_iterator fit;
struct ospf_area *oa=NULL,*atmp,*absroa; struct ospf_area *oa=NULL,*atmp,*absroa;
struct proto *p=&po->proto; struct proto *p=&po->proto;
struct ospf_lsa_ext *le; struct ospf_lsa_ext *le;
@ -274,6 +262,14 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
debug("%s: Starting routing table calculation for external routes\n", debug("%s: Starting routing table calculation for external routes\n",
p->name); p->name);
FIB_WALK(ef,nftmp)
{
nf=(struct extfib *)nftmp;
nf->metric=LSINFINITY;
nf->metric2=LSINFINITY;
}
FIB_WALK_END;
WALK_LIST(oa,po->area_list) WALK_LIST(oa,po->area_list)
{ {
if(!oa->stub) break; if(!oa->stub) break;
@ -298,7 +294,7 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
WALK_LIST(atmp,po->area_list) WALK_LIST(atmp,po->area_list)
{ {
if((nf=fib_get(&atmp->infib,&ip, mlen))!=NULL) break; if((nf=fib_find(&atmp->infib,&ip, mlen))!=NULL) break;
} }
if(nf!=NULL) continue; /* Some intra area path exists */ if(nf!=NULL) continue; /* Some intra area path exists */
@ -334,7 +330,7 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
met2=0; met2=0;
} }
} }
nf=fib_get(&po->efib,&ip, mlen); nf=fib_get(ef,&ip, mlen);
if((nf->metric>met) || ((nf->metric==met)&&(nf->metric2>met2))) if((nf->metric>met) || ((nf->metric==met)&&(nf->metric2>met2)))
{ {
nf->metric=met; nf->metric=met;
@ -346,7 +342,7 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
if((neigh=find_neigh_noifa(po,absr->lsa.rt))==NULL) if((neigh=find_neigh_noifa(po,absr->lsa.rt))==NULL)
{ {
goto skip2; continue;
} }
nn=neigh_find(p,&neigh->ip,0); nn=neigh_find(p,&neigh->ip,0);
DBG(" Next hop calculated: %I\n", nn->addr); DBG(" Next hop calculated: %I\n", nn->addr);
@ -362,37 +358,24 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
} }
DBG("\nNow syncing my rt table with nest's\n\n"); DBG("\nNow syncing my rt table with nest's\n\n");
FIB_ITERATE_INIT(&efit,&po->efib); FIB_ITERATE_INIT(&fit,ef);
again2: noch:
FIB_ITERATE_START(&po->efib,&efit,nfptmp) FIB_ITERATE_START(ef,&fit,nftmp)
{ {
nf=(struct extfib *)nfptmp; nf=(struct extfib *)nftmp;
if(nf->metric==LSINFINITY) if(nf->metric==LSINFINITY)
{ {
net *ne; net *ne;
rta a0;
bzero(&a0, sizeof(a0));
a0.proto=p;
a0.source=RTS_OSPF_EXT;
a0.scope=SCOPE_UNIVERSE; /* What's this good for? */
a0.cast=RTC_UNICAST;
a0.dest=RTD_ROUTER;
a0.flags=0;
a0.aflags=0;
a0.iface=nf->nhi;
a0.gw=nf->nh;
a0.from=nf->nh; /* FIXME Just a test */
ne=net_get(p->table, nf->fn.prefix, nf->fn.pxlen); ne=net_get(p->table, nf->fn.prefix, nf->fn.pxlen);
DBG("Deleting rt entry %I\n (IP: %I, GW: %I, Iface: %s)\n", DBG("Deleting rt entry %I\n (IP: %I, GW: %I)\n",
nf->fn.prefix,ip,nf->nh,nf->nhi->name); nf->fn.prefix,ip,nf->nh);
rte_update(p->table, ne, p, NULL); rte_update(p->table, ne, p, NULL);
/* Now delete my fib */ /* Now delete my fib */
FIB_ITERATE_PUT(&efit, nfptmp); FIB_ITERATE_PUT(&fit, nftmp);
fib_delete(&po->efib, nfptmp); fib_delete(ef, nftmp);
goto again2; goto noch;
} }
else else
{ {
@ -420,13 +403,13 @@ again2:
e->pflags = 0; e->pflags = 0;
e->net=ne; e->net=ne;
e->pref = p->preference; e->pref = p->preference;
DBG("Modifying rt entry %I\n (IP: %I, GW: %I, Iface: %s)\n", DBG("Modifying rt entry %I\n (IP: %I, GW: %I)\n",
nf->fn.prefix,ip,en->nh,en->nhi->name); nf->fn.prefix,ip,nf->nh);
rte_update(p->table, ne, p, e); rte_update(p->table, ne, p, e);
} }
} }
skip2: let:
FIB_ITERATE_END(nfptmp); FIB_ITERATE_END(nftmp);
} }
void void