forked from Mirror/frr
Merge pull request #8658 from gromit1811/bugfix_8567
Fix #8567 OSPFv3-26.13 ANVL failure
This commit is contained in:
commit
d390582e64
|
@ -1018,18 +1018,20 @@ void ospf6_receive_lsa(struct ospf6_neighbor *from,
|
||||||
if (is_debug)
|
if (is_debug)
|
||||||
zlog_debug(
|
zlog_debug(
|
||||||
"%s: Current copy of LSA %s is MAXAGE, but new has recent age, flooding/installing.",
|
"%s: Current copy of LSA %s is MAXAGE, but new has recent age, flooding/installing.",
|
||||||
old->name, __PRETTY_FUNCTION__);
|
__PRETTY_FUNCTION__, old->name);
|
||||||
ospf6_lsa_purge(old);
|
ospf6_lsa_purge(old);
|
||||||
ospf6_flood(from, new);
|
ospf6_flood(from, new);
|
||||||
ospf6_install_lsa(new);
|
ospf6_install_lsa(new);
|
||||||
} else {
|
return;
|
||||||
|
}
|
||||||
|
/* For self-originated LSA, only trust
|
||||||
|
* ourselves. Fall through and send
|
||||||
|
* LS Update with our current copy.
|
||||||
|
*/
|
||||||
if (is_debug)
|
if (is_debug)
|
||||||
zlog_debug(
|
zlog_debug(
|
||||||
"%s: Current copy of self-originated LSA %s is MAXAGE, but new has recent age, ignoring new.",
|
"%s: Current copy of self-originated LSA %s is MAXAGE, but new has recent age, re-sending current one.",
|
||||||
old->name, __PRETTY_FUNCTION__);
|
__PRETTY_FUNCTION__, old->name);
|
||||||
ospf6_lsa_delete(new);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXX, MinLSArrival check !? RFC 2328 13 (8) */
|
/* XXX, MinLSArrival check !? RFC 2328 13 (8) */
|
||||||
|
|
Loading…
Reference in a new issue