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

Merge pull request #11302 from punith-shivakumar/master

Browse Source 
ospf6d: add missing ABR task on interface start and change default task delay to 5
This commit is contained in:
Donatas Abraitis 2022-11-08 21:28:30 +02:00 committed by GitHub
commit 0b280b334c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ospf6d/ospf6_interface.c
View File

@ -37,6 +37,7 @@
#include "ospf6_route.h"
#include "ospf6_area.h"
#include "ospf6_abr.h"
#include "ospf6_nssa.h"
#include "ospf6_interface.h"
#include "ospf6_neighbor.h"
#include "ospf6_intra.h"
@ -1736,8 +1737,10 @@ void ospf6_interface_start(struct ospf6_interface *oi)
ospf6_interface_enable(oi);
/* If the router is ABR, originate summary routes */
if (ospf6_check_and_set_router_abr(ospf6))
if (ospf6_check_and_set_router_abr(ospf6)) {
ospf6_abr_enable_area(oa);
ospf6_schedule_abr_task(ospf6);
}
}
void ospf6_interface_stop(struct ospf6_interface *oi)

2
ospf6d/ospf6_nssa.h
View File

@ -45,7 +45,7 @@ extern unsigned char config_debug_ospf6_nssa;
#define OSPF6_LSA_APPROVED 0x08
#define OSPF6_LSA_LOCAL_XLT 0x40
#define OSPF6_ABR_TASK_DELAY 7
#define OSPF6_ABR_TASK_DELAY 5
int ospf6_area_nssa_no_summary_set(struct ospf6 *ospf6, struct in_addr area_id);
int ospf6_area_nssa_unset(struct ospf6 *ospf6, struct ospf6_area *area);

2
ospfd/ospf_abr.h
View File

@ -22,7 +22,7 @@
#ifndef _ZEBRA_OSPF_ABR_H
#define _ZEBRA_OSPF_ABR_H
#define OSPF_ABR_TASK_DELAY 7
#define OSPF_ABR_TASK_DELAY 5
#define OSPF_AREA_RANGE_ADVERTISE (1 << 0)
#define OSPF_AREA_RANGE_SUBSTITUTE (1 << 1)