Merge svn revisions 924 and 925 from Zebra CVS. Also remove useless
ospf6_lsdb prototype declaration from ospf6_lsa.h. Report sent to Yasuhiro
Ohara as well.
diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index c031a2d..8eea002 100644
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -109,7 +109,7 @@
}
/* ospf6 age functions */
-/* calculate birth and set expire timer */
+/* calculate birth */
static void
ospf6_lsa_age_set (struct ospf6_lsa *lsa)
{
@@ -123,11 +123,7 @@
lsa->birth.tv_sec = now.tv_sec - ntohs (lsa->header->age);
lsa->birth.tv_usec = now.tv_usec;
- if (ntohs (lsa->header->age) != MAXAGE)
- lsa->expire = thread_add_timer (master, ospf6_lsa_expire, lsa,
- MAXAGE + lsa->birth.tv_sec - now.tv_sec);
- else
- lsa->expire = NULL;
+
return;
}
@@ -421,7 +417,7 @@
/* dump string */
ospf6_lsa_printbuf (lsa, lsa->name, sizeof (lsa->name));
- /* calculate birth, expire and refresh of this lsa */
+ /* calculate birth of this lsa */
ospf6_lsa_age_set (lsa);
if (IS_OSPF6_DEBUG_LSA (MEMORY))
@@ -456,7 +452,7 @@
/* dump string */
ospf6_lsa_printbuf (lsa, lsa->name, sizeof (lsa->name));
- /* calculate birth, expire and refresh of this lsa */
+ /* calculate birth of this lsa */
ospf6_lsa_age_set (lsa);
if (IS_OSPF6_DEBUG_LSA (MEMORY))
@@ -500,6 +496,7 @@
copy = ospf6_lsa_create (lsa->header);
assert (copy->lock == 0);
+ copy->birth = lsa->birth;
copy->installed = lsa->installed;
copy->originated = lsa->originated;
copy->lsdb = lsa->lsdb;
@@ -559,7 +556,7 @@
/* reinstall lsa */
if (IS_OSPF6_DEBUG_LSA (DATABASE))
zlog_info ("Reinstall MaxAge %s", lsa->name);
- ospf6_lsdb_add (lsa, lsa->lsdb);
+ ospf6_install_lsa (lsa);
/* schedule maxage remover */
ospf6_maxage_remove (ospf6);
@@ -584,6 +581,8 @@
old->header->adv_router, lsdb_self);
if (self == NULL)
{
+ if (IS_OSPF6_DEBUG_LSA (ORIGINATE))
+ zlog_info ("Refresh: could not find self LSA, flush %s", old->name);
ospf6_lsa_premature_aging (old);
return 0;
}