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

Merge pull request #7304 from volta-networks/fix_vs_1811

Browse Source 
ospfd: fix invocation of ospfTrapNbrStateChange
This commit is contained in:
Donald Sharp 2020-10-15 11:17:10 -04:00 committed by GitHub
commit 5aa303c9b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ospfd/ospf_snmp.c
View File

@ -2486,20 +2486,25 @@ static void ospfTrapVirtNbrStateChange(struct ospf_neighbor *on)
static int ospf_snmp_nsm_change(struct ospf_neighbor *nbr, int next_state, static int ospf_snmp_nsm_change(struct ospf_neighbor *nbr, int next_state,
int old_state) int old_state)
{ {
/* Terminal state or regression */ /* Transition to/from state Full should be handled only by
if ((next_state == NSM_Full) || (next_state == NSM_TwoWay) * DR when in Broadcast or Non-Brodcast Multi-Access networks
|| (next_state < old_state)) { */
/* ospfVirtNbrStateChange */ if ((next_state == NSM_Full || old_state == NSM_Full)
&& (nbr->oi->state != ISM_DR)
&& (nbr->oi->type == OSPF_IFTYPE_BROADCAST
|| nbr->oi->type == OSPF_IFTYPE_NBMA))
return 0;
/* State progression to non-terminal state */
if (next_state > old_state && next_state != NSM_Full
&& next_state != NSM_TwoWay)
return 0;
if (nbr->oi->type == OSPF_IFTYPE_VIRTUALLINK) if (nbr->oi->type == OSPF_IFTYPE_VIRTUALLINK)
ospfTrapVirtNbrStateChange(nbr); ospfTrapVirtNbrStateChange(nbr);
/* ospfNbrStateChange trap */
else else
/* To/From FULL, only managed by DR */
if (((next_state != NSM_Full)
&& (nbr->state != NSM_Full))
|| (nbr->oi->state == ISM_DR))
ospfTrapNbrStateChange(nbr); ospfTrapNbrStateChange(nbr);
}
return 0; return 0;
} }