proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 11:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8557 from rgirada/ospf_type5_fix

Browse Source 
ospfd: External lsa handling in opaque capabilities enable/disable
This commit is contained in:
Russ White 2021-06-22 09:45:27 -04:00 committed by GitHub
commit d550a64cd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ospfd/ospf_lsa.c
View File

@ -2084,6 +2084,8 @@ void ospf_external_lsa_rid_change(struct ospf *ospf)
{ {
struct external_info *ei; struct external_info *ei;
struct ospf_external_aggr_rt *aggr; struct ospf_external_aggr_rt *aggr;
struct ospf_lsa *lsa = NULL;
int force;
int type; int type;
for (type = 0; type < ZEBRA_ROUTE_MAX; type++) { for (type = 0; type < ZEBRA_ROUTE_MAX; type++) {
@ -2115,24 +2117,48 @@ void ospf_external_lsa_rid_change(struct ospf *ospf)
(struct prefix_ipv4 *)&ei->p)) (struct prefix_ipv4 *)&ei->p))
continue; continue;
if (!ospf_redistribute_check(ospf, ei, NULL)) lsa = ospf_external_info_find_lsa(ospf, &ei->p);
continue;
aggr = ospf_external_aggr_match(ospf, &ei->p); aggr = ospf_external_aggr_match(ospf, &ei->p);
if (aggr) { if (aggr) {
if (!ospf_redistribute_check(ospf, ei,
NULL))
continue;
if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR)) if (IS_DEBUG_OSPF(lsa, EXTNL_LSA_AGGR))
zlog_debug( zlog_debug(
"Originate Summary LSA after reset/router-ID change"); "Originate Summary LSA after reset/router-ID change");
/* Here the LSA is originated as new */ /* Here the LSA is originated as new */
ospf_originate_summary_lsa(ospf, aggr, ospf_originate_summary_lsa(ospf, aggr,
ei); ei);
} else if (!ospf_external_lsa_originate(ospf, } else if (lsa) {
ei)) /* LSA needs to be refreshed even if
flog_warn(EC_OSPF_LSA_INSTALL_FAILURE, * there is no change in the route
* params if the LSA is in maxage.
*/
if (IS_LSA_MAXAGE(lsa))
force = LSA_REFRESH_FORCE;
else
force = LSA_REFRESH_IF_CHANGED;
ospf_external_lsa_refresh(ospf, lsa,
ei, force, 0);
} else {
if (!ospf_redistribute_check(ospf, ei,
NULL))
continue;
if (!ospf_external_lsa_originate(ospf,
NULL))
flog_warn(
EC_OSPF_LSA_INSTALL_FAILURE,
"LSA: AS-external-LSA was not originated."); "LSA: AS-external-LSA was not originated.");
} }
} }
} }
}
ei = ospf_default_external_info(ospf); ei = ospf_default_external_info(ospf);
if (ei && !ospf_external_lsa_originate(ospf, ei)) { if (ei && !ospf_external_lsa_originate(ospf, ei)) {

3
ospfd/ospf_neighbor.c
View File

@ -407,6 +407,9 @@ void ospf_renegotiate_optional_capabilities(struct ospf *top)
} }
} }
/* Refresh/Re-originate external LSAs (Type-7 and Type-5).*/
ospf_external_lsa_rid_change(top);
return; return;
} }