Merge pull request #7580 from ckishimo/bit-Nt

ospfd: fix NSSA translate-always
This commit is contained in:
Donald Sharp 2020-11-21 11:36:01 -05:00 committed by GitHub
commit 4c73df7a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1603,7 +1603,8 @@ int ospf_area_nssa_unset(struct ospf *ospf, struct in_addr area_id, int argc)
OSPF_NSSA_TRANS_STABLE_DEFAULT;
ospf_area_type_set(area, OSPF_AREA_DEFAULT);
} else {
area->NSSATranslatorRole = OSPF_NSSA_ROLE_CANDIDATE;
ospf_area_nssa_translator_role_set(ospf, area_id,
OSPF_NSSA_ROLE_CANDIDATE);
}
ospf_area_check_free(ospf, area_id);
@ -1620,7 +1621,19 @@ int ospf_area_nssa_translator_role_set(struct ospf *ospf,
if (area == NULL)
return 0;
area->NSSATranslatorRole = role;
if (role != area->NSSATranslatorRole) {
if ((area->NSSATranslatorRole == OSPF_NSSA_ROLE_ALWAYS)
|| (role == OSPF_NSSA_ROLE_ALWAYS)) {
/* RFC 3101 3.1
* if new role is OSPF_NSSA_ROLE_ALWAYS we need to set
* Nt bit, if the role was OSPF_NSSA_ROLE_ALWAYS we need
* to clear Nt bit
*/
area->NSSATranslatorRole = role;
ospf_router_lsa_update_area(area);
} else
area->NSSATranslatorRole = role;
}
return 1;
}