summaryrefslogtreecommitdiff
path: root/proto/ospf/lsalib.c
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2010-04-24 15:18:21 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2010-04-24 15:18:21 +0200
commit0ea8fb4abe5acad0b8f470bbdc5cc929b6a58ced (patch)
tree5d8d0538e2ce7e138df1936b8cf64aadbc063bce /proto/ospf/lsalib.c
parent1d44ddf20f3ecef864d4bd20355251839fcd10ee (diff)
Fixes and enhancements in 'show ospf state' command.
Now it shows a distance, option to change showing reachable/all network nodes and better handling of AS-external LSAs in multiple areas. The command 'show ospf topology' was changed to not show stubnets in both OSPFv2 and OSPFv3 (previously it displayed stubnets in OSPFv2).
Diffstat (limited to 'proto/ospf/lsalib.c')
-rw-r--r--proto/ospf/lsalib.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/proto/ospf/lsalib.c b/proto/ospf/lsalib.c
index 35f02dcd..53c25623 100644
--- a/proto/ospf/lsalib.c
+++ b/proto/ospf/lsalib.c
@@ -45,19 +45,16 @@ ospf_age(struct proto_ospf *po)
struct top_hash_entry *en, *nxt;
int flush = can_flush_lsa(po);
- if (po->cleanup) OSPF_TRACE(D_EVENTS, "Running ospf_age cleanup");
-
WALK_SLIST_DELSAFE(en, nxt, po->lsal)
{
- if (po->cleanup)
+ if (po->calcrt)
{
+ /* Cleanup before ospf_rt_spf() */
en->color = OUTSPF;
en->dist = LSINFINITY;
en->nhi = NULL;
en->nh = IPA_NONE;
en->lb = IPA_NONE;
- DBG("Infinitying Type: %u, Id: %R, Rt: %R\n", en->lsa.type,
- en->lsa.id, en->lsa.rt);
}
if (en->lsa.age == LSA_MAXAGE)
{
@@ -88,7 +85,6 @@ ospf_age(struct proto_ospf *po)
en->lsa.age = LSA_MAXAGE;
}
}
- po->cleanup = 0;
}
void