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

vrrpd: fix more timer bugs

Browse Source 
* Fix overflow in skew time computation
* Fix accidentally removed initial setting of advertisement interval

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-12-06 22:19:11 +00:00
parent 1d21789e16
commit 1485d9e525
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vrrpd/vrrp.c
View File

@ -78,10 +78,9 @@ static void vrrp_update_times(struct vrrp_vrouter *vr,
{ {
vr->advertisement_interval = advertisement_interval; vr->advertisement_interval = advertisement_interval;
vr->master_adver_interval = master_adver_interval; vr->master_adver_interval = master_adver_interval;
vr->skew_time = (256 - vr->priority) * vr->master_adver_interval; vr->skew_time = ((256 - vr->priority) * master_adver_interval) / 256;
vr->skew_time /= 256; vr->master_down_interval = (3 * master_adver_interval);
vr->master_down_interval = (3 * vr->master_adver_interval); vr->master_down_interval += vr->skew_time;
vr->master_down_interval /= 256 + vr->skew_time;
} }
/* /*
@ -141,6 +140,7 @@ struct vrrp_vrouter *vrrp_vrouter_create(struct interface *ifp, uint8_t vrid)
vrrp_mac_set(&vr->vr_mac_v4, false, vrid); vrrp_mac_set(&vr->vr_mac_v4, false, vrid);
vrrp_mac_set(&vr->vr_mac_v6, true, vrid); vrrp_mac_set(&vr->vr_mac_v6, true, vrid);
vr->fsm.state = VRRP_STATE_INITIALIZE; vr->fsm.state = VRRP_STATE_INITIALIZE;
vrrp_set_advertisement_interval(vr, VRRP_DEFAULT_ADVINT);
vrrp_reset_times(vr); vrrp_reset_times(vr);
hash_get(vrrp_vrouters_hash, vr, hash_alloc_intern); hash_get(vrrp_vrouters_hash, vr, hash_alloc_intern);