mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Routing table calculation for ext LSAs having next-hop=!0.0.0.0

Browse Source
This commit is contained in:
Ondrej Filip
2000-05-16 22:34:49 +00:00
parent a96a979d5b
commit 508c36ab79
1 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
proto/ospf/rt.c
View File

@@ -289,6 +289,11 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
if(lt->metric==LSINFINITY) continue; if(lt->metric==LSINFINITY) continue;
ip=ipa_and(ipa_from_u32(en->lsa.id),le->netmask); ip=ipa_and(ipa_from_u32(en->lsa.id),le->netmask);
mlen=ipa_mklen(le->netmask); mlen=ipa_mklen(le->netmask);
if((mlen<0)||(mlen>32))
{
die("Invalid length of prefix! ID: %I, RT: %I, Type: %u, mask %I",
en->lsa.id,en->lsa.rt,en->lsa.type,le->netmask);
}
nf=NULL; nf=NULL;
@@ -304,8 +309,6 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
met=0;met2=0; met=0;met2=0;
if(1 || ipa_compare(lt->fwaddr,ipa_from_u32(0))==0) /* FIXME add fwaddr */
{
WALK_LIST(atmp,po->area_list) WALK_LIST(atmp,po->area_list)
{ {
if((etmp=ospf_hash_find(atmp->gr,en->lsa.rt,en->lsa.rt,LSA_T_RT))!=NULL) if((etmp=ospf_hash_find(atmp->gr,en->lsa.rt,en->lsa.rt,LSA_T_RT))!=NULL)
@@ -315,10 +318,14 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
{ {
absr=etmp; absr=etmp;
absroa=atmp; absroa=atmp;
break;
} }
} }
} }
if(absr==NULL) continue; if(absr==NULL) continue;
if(1 || ipa_compare(lt->fwaddr,ipa_from_u32(0))==0) /* FIXME add fwaddr */
{
if(lt->etos>0) if(lt->etos>0)
{ {
met=absr->dist; met=absr->dist;
@@ -330,6 +337,29 @@ ospf_ext_spfa(struct proto_ospf *po) /* FIXME looking into inter-area */
met2=0; met2=0;
} }
} }
else
{
nf=NULL;
WALK_LIST(atmp,po->area_list)
{
if((nf=fib_route(&atmp->infib,lt->fwaddr,32))!=NULL)
{
break;
}
}
if(nf==NULL) continue;
if(lt->etos>0)
{
met=nf->metric;
met2=lt->metric;
}
else
{
met=nf->metric+lt->metric;
met2=0;
}
}
nf=fib_get(ef,&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)))
{ {