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

Minor bugfixes in routing table calsulation.

Browse source
This commit is contained in:
Ondrej Filip 2005-02-15 16:17:42 +00:00
parent 8ffc753441
commit 27a1e3ac35
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
proto/ospf/rt.c
View file

@ -227,16 +227,16 @@ ospf_rt_spfa(struct ospf_area *oa)
{ {
struct ospf_iface *iff; struct ospf_iface *iff;
WALK_LIST(iff, po->iface_list) WALK_LIST(iff, po->iface_list) /* Try to find corresponding interface */
{ {
if (iff->iface && (rtl->id == (ipa_to_u32(ipa_mkmask(iff->iface->addr->pxlen)) if (iff->iface && (iff->type != OSPF_IT_VLINK) &&
& ipa_to_u32(iff->iface->addr->prefix)))) (rtl->id == (ipa_to_u32(ipa_mkmask(iff->iface->addr->pxlen))
& ipa_to_u32(iff->iface->addr->prefix)))) /* No VLINK and IP must match */
{ {
nf.ifa = iff; nf.ifa = iff;
break; break;
} }
} }
} }
if (!nf.ifa) if (!nf.ifa)
@ -448,7 +448,7 @@ ospf_rt_sum_tr(struct ospf_area *oa)
tm = (union ospf_lsa_sum_tm *)(mask + 1); tm = (union ospf_lsa_sum_tm *)(mask + 1);
nf.type = re->n.type; nf.type = re->n.type;
nf.capa = ORTA_ABR; nf.capa = ORTA_ASBR;
nf.metric1 = abr->n.metric1 + (tm->metric & METRIC_MASK); nf.metric1 = abr->n.metric1 + (tm->metric & METRIC_MASK);
nf.metric2 = LSINFINITY; nf.metric2 = LSINFINITY;
nf.oa = oa; nf.oa = oa;
@ -466,7 +466,7 @@ ospf_rt_sum(struct ospf_area *oa)
struct proto_ospf *po = oa->po; struct proto_ospf *po = oa->po;
struct proto *p = &po->proto; struct proto *p = &po->proto;
struct top_hash_entry *en; struct top_hash_entry *en;
ip_addr *mask, ip, abrip; ip_addr *mask, ip, abrip; /* abrIP is actually ID */
struct area_net *anet; struct area_net *anet;
orta nf; orta nf;
ort *re, *abr; ort *re, *abr;
@ -527,7 +527,7 @@ ospf_rt_sum(struct ospf_area *oa)
if (!(abr->n.capa & ORTA_ABR)) continue; if (!(abr->n.capa & ORTA_ABR)) continue;
nf.type = RTS_OSPF_IA; nf.type = RTS_OSPF_IA;
nf.capa = ORTA_ABR; nf.capa = ORTA_ASBR;
nf.metric1 = abr->n.metric1 + (tm->metric & METRIC_MASK); nf.metric1 = abr->n.metric1 + (tm->metric & METRIC_MASK);
nf.metric2 = LSINFINITY; nf.metric2 = LSINFINITY;
nf.oa = oa; nf.oa = oa;
@ -980,6 +980,10 @@ again1:
} }
if (!found) nf->n.metric1 = LSINFINITY; /* Delete it */ if (!found) nf->n.metric1 = LSINFINITY; /* Delete it */
} }
if (!a0.iface) /* Still no match? Can this really happen? */
nf->n.metric1 = LSINFINITY;
ne = net_get(p->table, nf->fn.prefix, nf->fn.pxlen); ne = net_get(p->table, nf->fn.prefix, nf->fn.pxlen);
if (nf->n.metric1 < LSINFINITY) if (nf->n.metric1 < LSINFINITY)
{ {
@ -990,8 +994,8 @@ again1:
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)\n", DBG("Mod rte type %d - %I/%d via %I on iface %s, met %d\n",
nf->fn.prefix, ip, nf->nh); a0.source, nf->fn.prefix, nf->fn.pxlen, a0.gw, a0.iface ? a0.iface->name : "(none)", nf->n.metric1);
rte_update(p->table, ne, p, e); rte_update(p->table, ne, p, e);
} }
else else