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

Merge pull request #7449 from sudhanshukumar22/bgp-update-connect-timer

Browse Source 
bgpd: config connect timer not applied immediately for non-established peers.
This commit is contained in:
Donatas Abraitis 2021-02-03 12:15:04 +02:00 committed by GitHub
commit fe7bc9964e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bgpd/bgpd.c
View File

@ -5305,9 +5305,14 @@ int peer_timers_connect_set(struct peer *peer, uint32_t connect)
peer->v_connect = connect; peer->v_connect = connect;
/* Skip peer-group mechanics for regular peers. */ /* Skip peer-group mechanics for regular peers. */
if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
if (peer->status != Established) {
if (peer_active(peer))
BGP_EVENT_ADD(peer, BGP_Stop);
BGP_EVENT_ADD(peer, BGP_Start);
}
return 0; return 0;
}
/* /*
* Set flag and configuration on all peer-group members, unless they are * Set flag and configuration on all peer-group members, unless they are
* explicitely overriding peer-group configuration. * explicitely overriding peer-group configuration.
@ -5321,6 +5326,12 @@ int peer_timers_connect_set(struct peer *peer, uint32_t connect)
SET_FLAG(member->flags, PEER_FLAG_TIMER_CONNECT); SET_FLAG(member->flags, PEER_FLAG_TIMER_CONNECT);
member->connect = connect; member->connect = connect;
member->v_connect = connect; member->v_connect = connect;
if (member->status != Established) {
if (peer_active(member))
BGP_EVENT_ADD(member, BGP_Stop);
BGP_EVENT_ADD(member, BGP_Start);
}
} }
return 0; return 0;
@ -5348,9 +5359,14 @@ int peer_timers_connect_unset(struct peer *peer)
peer->v_connect = peer->bgp->default_connect_retry; peer->v_connect = peer->bgp->default_connect_retry;
/* Skip peer-group mechanics for regular peers. */ /* Skip peer-group mechanics for regular peers. */
if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
if (peer->status != Established) {
if (peer_active(peer))
BGP_EVENT_ADD(peer, BGP_Stop);
BGP_EVENT_ADD(peer, BGP_Start);
}
return 0; return 0;
}
/* /*
* Remove flag and configuration from all peer-group members, unless * Remove flag and configuration from all peer-group members, unless
* they are explicitely overriding peer-group configuration. * they are explicitely overriding peer-group configuration.
@ -5364,6 +5380,12 @@ int peer_timers_connect_unset(struct peer *peer)
UNSET_FLAG(member->flags, PEER_FLAG_TIMER_CONNECT); UNSET_FLAG(member->flags, PEER_FLAG_TIMER_CONNECT);
member->connect = 0; member->connect = 0;
member->v_connect = peer->bgp->default_connect_retry; member->v_connect = peer->bgp->default_connect_retry;
if (member->status != Established) {
if (peer_active(member))
BGP_EVENT_ADD(member, BGP_Stop);
BGP_EVENT_ADD(member, BGP_Start);
}
} }
return 0; return 0;