Merge pull request #7559 from ckishimo/translator

ospfd: fix NSSA translator
This commit is contained in:
Donald Sharp 2020-11-19 19:33:59 -05:00 committed by GitHub
commit e1b89f023b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions

View File

@ -379,7 +379,7 @@ static int ospf_abr_nssa_am_elected(struct ospf_area *area)
/* Check NSSA ABR status
* assumes there are nssa areas
*/
static void ospf_abr_nssa_check_status(struct ospf *ospf)
void ospf_abr_nssa_check_status(struct ospf *ospf)
{
struct ospf_area *area;
struct listnode *lnode, *nnode;

View File

@ -83,4 +83,5 @@ extern void ospf_schedule_abr_task(struct ospf *);
extern void ospf_abr_announce_network_to_area(struct prefix_ipv4 *, uint32_t,
struct ospf_area *);
extern void ospf_abr_nssa_check_status(struct ospf *ospf);
#endif /* _ZEBRA_OSPF_ABR_H */

View File

@ -1432,8 +1432,11 @@ static int ospf_spf_calculate_schedule_worker(struct thread *thread)
/* ABRs may require additional changes, see RFC 2328 16.7. */
monotime(&start_time);
if (IS_OSPF_ABR(ospf))
if (IS_OSPF_ABR(ospf)) {
if (ospf->anyNSSA)
ospf_abr_nssa_check_status(ospf);
ospf_abr_task(ospf);
}
abr_time = monotime_since(&start_time, NULL);
/* Schedule Segment Routing update */