[ospf6d] GNU Zebra 3560: Call ospf6_maxage_remove when out of Exchange/Loading
2005-10-20 Yasuhiro Ohara <yasu@sfc.wide.ad.jp>
* ospf6_neighbor.c: add the calling of ospf6_maxage_remove ()
when the neighbor went out of Exchange/Loading.
diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index f374cfc..2676a3f 100644
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-20 Yasuhiro Ohara <yasu@sfc.wide.ad.jp>
+
+ * ospf6_neighbor.c: add the calling of ospf6_maxage_remove ()
+ when the neighbor went out of Exchange/Loading.
+
2005-10-06 Yasuhiro Ohara <yasu@sfc.wide.ad.jp>
* ospf6_asbr.c: fix bug of calculating AS-External routes
diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index 017da52..fbda675 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -1119,11 +1119,11 @@
zlog_debug ("Acknowledged, remove from %s's retrans-list",
on->name);
+ ospf6_decrement_retrans_count (mine);
+ ospf6_lsdb_remove (mine, on->retrans_list);
if (OSPF6_LSA_IS_MAXAGE (mine))
ospf6_maxage_remove (on->ospf6_if->area->ospf6);
- ospf6_decrement_retrans_count (mine);
- ospf6_lsdb_remove (mine, on->retrans_list);
ospf6_lsa_delete (his);
}
diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index dd46ebc..b0db345 100644
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -175,20 +175,11 @@
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (on->ospf6_if->area);
}
-#ifdef XXX
- if (prev_state == NBS_FULL || next_state == NBS_FULL)
- nbs_full_change (on->ospf6_interface);
-
- /* check for LSAs that already reached MaxAge */
if ((prev_state == OSPF6_NEIGHBOR_EXCHANGE ||
prev_state == OSPF6_NEIGHBOR_LOADING) &&
(next_state != OSPF6_NEIGHBOR_EXCHANGE &&
next_state != OSPF6_NEIGHBOR_LOADING))
- {
- ospf6_maxage_remover ();
- }
-#endif /*XXX*/
-
+ ospf6_maxage_remove (on->ospf6_if->area->ospf6);
}
/* RFC2328 section 10.4 */