From 60e04f041303fdafd0abf0dec003a9745345c68a Mon Sep 17 00:00:00 2001 From: Ondrej Filip Date: Fri, 18 Feb 2005 18:51:42 +0000 Subject: Minor bugfix: Summary LSA for aggregated area was always propagated with metric = 1. Now it's metric of most distant component. --- proto/ospf/rt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'proto/ospf/rt.c') diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index 7f7f4635..b3de8bfd 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -119,7 +119,10 @@ ri_install(struct proto_ospf *po, ip_addr prefix, int pxlen, int dest, old->efn = ipath; } if ((new->type == RTS_OSPF) && (anet = (struct area_net *)fib_route(&oa->net_fib, prefix, pxlen))) + { anet->active = 1; + if (new->metric1 < anet->metric) anet->metric = new->metric1; + } } else { @@ -585,6 +588,7 @@ ospf_rt_spf(struct proto_ospf *po) { anet = (struct area_net *) nftmp; anet->active = 0; + anet->metric = LSINFINITY; } FIB_WALK_END; ospf_rt_spfa(oa); @@ -1046,7 +1050,7 @@ again2: if ((oa == po->backbone) && oaa->trcap) fl = 1; if(fl) flush_sum_lsa(oaa, &anet->fn, ORT_NET); - else originate_sum_lsa(oaa, &anet->fn, ORT_NET, 1); + else originate_sum_lsa(oaa, &anet->fn, ORT_NET, anet->metric); } } FIB_WALK_END; -- cgit v1.2.3