Merge pull request #12317 from mobash-rasool/ospf-fixes

ospfd: Fix RFC conformance test cases 25.19 and 27.6
This commit is contained in:
Russ White 2022-11-24 10:21:25 -05:00 committed by GitHub
commit d15c84fa22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions

View File

@ -52,6 +52,7 @@ extern "C" {
#define OSPF_DEFAULT_DESTINATION 0x00000000 /* 0.0.0.0 */
#define OSPF_INITIAL_SEQUENCE_NUMBER 0x80000001U
#define OSPF_MAX_SEQUENCE_NUMBER 0x7fffffffU
#define OSPF_INVALID_SEQUENCE_NUMBER 0x80000000U
/* OSPF Interface Types */
#define OSPF_IFTYPE_NONE 0

View File

@ -3648,6 +3648,7 @@ void ospf_flush_self_originated_lsas_now(struct ospf *ospf)
struct ospf_interface *oi;
struct ospf_lsa *lsa;
struct route_node *rn;
struct ospf_if_params *oip;
int need_to_flush_ase = 0;
ospf->inst_shutdown = 1;
@ -3680,6 +3681,12 @@ void ospf_flush_self_originated_lsas_now(struct ospf *ospf)
ospf_lsa_flush_area(oi->network_lsa_self, area);
ospf_lsa_unlock(&oi->network_lsa_self);
oi->network_lsa_self = NULL;
oip = ospf_lookup_if_params(
oi->ifp, oi->address->u.prefix4);
if (oip)
oip->network_lsa_seqnum = htonl(
OSPF_INVALID_SEQUENCE_NUMBER);
}
if (oi->type != OSPF_IFTYPE_VIRTUALLINK