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

Temporary OSPFv3 devel commit

Browse source
This commit is contained in:
Ondrej Zajicek 2009-11-17 10:31:33 +01:00
parent 4ac7c8341c
commit cbf8b08d62
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
proto/ospf/lsupd.c
View file

@ -501,6 +501,7 @@ ospf_lsupd_receive(struct ospf_packet *ps_i, struct ospf_iface *ifa,
DBG("Update Type: %u ID: %R RT: %R, Sn: 0x%08x Age: %u, Sum: %u\n", DBG("Update Type: %u ID: %R RT: %R, Sn: 0x%08x Age: %u, Sum: %u\n",
lsatmp.type, lsatmp.id, lsatmp.rt, lsatmp.sn, lsatmp.age, lsatmp.checksum); lsatmp.type, lsatmp.id, lsatmp.rt, lsatmp.sn, lsatmp.age, lsatmp.checksum);
/* FIXME domain should be link id for unknown LSA types with zero Ubit */
u32 domain = ospf_lsa_domain(lsatmp.type, ifa); u32 domain = ospf_lsa_domain(lsatmp.type, ifa);
lsadb = ospf_hash_find_header(po->gr, domain, &lsatmp); lsadb = ospf_hash_find_header(po->gr, domain, &lsatmp);

27
proto/ospf/rt.c
View file

@ -360,20 +360,19 @@ ospf_rt_spfa(struct ospf_area *oa)
if (rt->options & OPT_RT_V) if (rt->options & OPT_RT_V)
oa->trcap = 1; oa->trcap = 1;
/* FIXME - in OSPFv3, should we add all routers, or just ABRs an ASBRs? */ /* In OSPFv2, just ASBRs and ABRs are needed to add to oa->rtr table */
if ((rt->options & OPT_RT_V) || (rt->options & OPT_RT_E)) // ((rt->options & OPT_RT_V) || (rt->options & OPT_RT_E))
{
nf.type = RTS_OSPF; nf.type = RTS_OSPF;
nf.options = rt->options; nf.options = rt->options;
nf.metric1 = act->dist; nf.metric1 = act->dist;
nf.metric2 = LSINFINITY; nf.metric2 = LSINFINITY;
nf.tag = 0; nf.tag = 0;
nf.oa = oa; nf.oa = oa;
nf.ar = act; nf.ar = act;
nf.nh = act->nh; nf.nh = act->nh;
nf.ifa = act->nhi; nf.ifa = act->nhi;
ri_install(po, ipa_from_rid(act->lsa.rt), MAX_PREFIX_LENGTH, ORT_ROUTER, &nf, NULL); ri_install(po, ipa_from_rid(act->lsa.rt), MAX_PREFIX_LENGTH, ORT_ROUTER, &nf, NULL);
}
#ifdef OSPFv2 #ifdef OSPFv2
ospf_rt_spfa_rtlinks(oa, act, act); ospf_rt_spfa_rtlinks(oa, act, act);