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

OSPF routes appeared with random value of ospf_tag attribute.

Browse source 
This patch fixes it.
This commit is contained in:
Ondrej Zajicek 2008-11-14 21:13:56 +01:00
parent e29fa06ece
commit 3f670371cf
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
proto/ospf/rt.c
View file

@ -195,6 +195,7 @@ ospf_rt_spfa(struct ospf_area *oa)
if (rt->veb.bit.e) nf.capa |= ORTA_ASBR; if (rt->veb.bit.e) nf.capa |= ORTA_ASBR;
nf.metric1 = act->dist; nf.metric1 = act->dist;
nf.metric2 = LSINFINITY; nf.metric2 = LSINFINITY;
nf.tag = 0;
nf.oa = oa; nf.oa = oa;
nf.ar = act; nf.ar = act;
nf.nh = act->nh; nf.nh = act->nh;
@ -221,6 +222,7 @@ ospf_rt_spfa(struct ospf_area *oa)
nf.capa = 0; nf.capa = 0;
nf.metric1 = act->dist + rtl->metric; nf.metric1 = act->dist + rtl->metric;
nf.metric2 = LSINFINITY; nf.metric2 = LSINFINITY;
nf.tag = 0;
nf.oa = oa; nf.oa = oa;
nf.ar = act; nf.ar = act;
nf.nh = act->nh; nf.nh = act->nh;
@ -278,6 +280,7 @@ ospf_rt_spfa(struct ospf_area *oa)
nf.capa = 0; nf.capa = 0;
nf.metric1 = act->dist; nf.metric1 = act->dist;
nf.metric2 = LSINFINITY; nf.metric2 = LSINFINITY;
nf.tag = 0;
nf.oa = oa; nf.oa = oa;
nf.ar = act; nf.ar = act;
nf.nh = act->nh; nf.nh = act->nh;
@ -454,6 +457,7 @@ ospf_rt_sum_tr(struct ospf_area *oa)
nf.capa = ORTA_ASBR; 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.tag = 0;
nf.oa = oa; nf.oa = oa;
nf.ar = abr->n.ar; nf.ar = abr->n.ar;
nf.nh = abr->n.nh; nf.nh = abr->n.nh;
@ -533,6 +537,7 @@ ospf_rt_sum(struct ospf_area *oa)
nf.capa = ORTA_ASBR; 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.tag = 0;
nf.oa = oa; nf.oa = oa;
nf.ar = abr->n.ar; nf.ar = abr->n.ar;
nf.nh = abr->n.nh; nf.nh = abr->n.nh;
@ -754,11 +759,11 @@ ospf_ext_spf(struct proto_ospf *po)
nfa.capa = 0; nfa.capa = 0;
nfa.metric1 = met1; nfa.metric1 = met1;
nfa.metric2 = met2; nfa.metric2 = met2;
nfa.tag = lt->tag;
nfa.oa = (po->backbone == NULL) ? HEAD(po->area_list) : po->backbone; nfa.oa = (po->backbone == NULL) ? HEAD(po->area_list) : po->backbone;
nfa.ar = nf1->n.ar; nfa.ar = nf1->n.ar;
nfa.nh = nh; nfa.nh = nh;
nfa.ifa = nhi; nfa.ifa = nhi;
nfa.tag = lt->tag;
ri_install(po, ip, mlen, ORT_NET, &nfa, nfh); ri_install(po, ip, mlen, ORT_NET, &nfa, nfh);
} }