matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

[ospf6d] GNU Zebra 3560: Call ospf6_maxage_remove when out of Exchange/Loading

Browse source 
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.
This commit is contained in:
Paul Jakma 2006-05-15 10:42:24 +00:00
parent cb4b88452e
commit 932bf1976a
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ospf6d/ChangeLog
View file

@ -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

4
ospf6d/ospf6_message.c
View file

@ -1119,11 +1119,11 @@ ospf6_lsack_recv (struct in6_addr *src, struct in6_addr *dst,
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);
}

11
ospf6d/ospf6_neighbor.c
View file

@ -175,20 +175,11 @@ ospf6_neighbor_state_change (u_char next_state, struct ospf6_neighbor *on)
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 */