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

Merge pull request #9716 from rgirada/ospf_gr_nbr

Browse Source 
ospfd: GR helper functionality change in helper exit
This commit is contained in:
Russ White 2021-10-05 19:28:40 -04:00 committed by GitHub
commit cf3a190ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ospfd/ospf_gr_helper.c
View File

@ -723,14 +723,10 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr,
/* check exit triggered due to successful completion /* check exit triggered due to successful completion
* of graceful restart. * of graceful restart.
* If no, bring down the neighbour.
*/ */
if (reason != OSPF_GR_HELPER_COMPLETED) { if (reason != OSPF_GR_HELPER_COMPLETED) {
if (IS_DEBUG_OSPF_GR) if (IS_DEBUG_OSPF_GR)
zlog_debug( zlog_debug("%s, Unsuccessful GR exit", __func__);
"%s, Failed GR exit, so bringing down the neighbour",
__func__);
OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_KillNbr);
} }
/*Recalculate the DR for the network segment */ /*Recalculate the DR for the network segment */

7
ospfd/ospf_nsm.c
View File

@ -76,10 +76,13 @@ static int ospf_inactivity_timer(struct thread *thread)
*/ */
if (!OSPF_GR_IS_ACTIVE_HELPER(nbr)) if (!OSPF_GR_IS_ACTIVE_HELPER(nbr))
OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_InactivityTimer); OSPF_NSM_EVENT_SCHEDULE(nbr, NSM_InactivityTimer);
else if (IS_DEBUG_OSPF_GR) else if (IS_DEBUG_OSPF_GR) {
zlog_debug( zlog_debug(
"%s, Acting as HELPER for this neighbour, So inactivitytimer event will not be fired.", "%s, Acting as HELPER for this neighbour, So restart the dead timer",
__func__); __func__);
OSPF_NSM_TIMER_ON(nbr->t_inactivity, ospf_inactivity_timer,
nbr->v_inactivity);
}
return 0; return 0;
} }