proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 11:19:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Remove BGP_UPDATE_DELAY_MIN/MAX

Browse Source 
Found randomly, and seems not used anymore.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2024-08-07 17:39:28 +03:00
parent 0e1088c761
commit 14b5c78d44
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bgpd/bgp_vty.c
View File

@ -2267,9 +2267,9 @@ static int bgp_global_update_delay_config_vty(struct vty *vty,
* Note that we only need to check this if this is the first time * Note that we only need to check this if this is the first time
* setting the global config. * setting the global config.
*/ */
if (bm->v_update_delay == BGP_UPDATE_DELAY_DEF) { if (bm->v_update_delay == BGP_UPDATE_DELAY_DEFAULT) {
for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) { for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) {
if (bgp->v_update_delay != BGP_UPDATE_DELAY_DEF) { if (bgp->v_update_delay != BGP_UPDATE_DELAY_DEFAULT) {
vty_out(vty, vty_out(vty,
"%% update-delay configuration found in vrf %s\n", "%% update-delay configuration found in vrf %s\n",
bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT
@ -2314,7 +2314,7 @@ static int bgp_global_update_delay_deconfig_vty(struct vty *vty)
struct listnode *node, *nnode; struct listnode *node, *nnode;
struct bgp *bgp; struct bgp *bgp;
bm->v_update_delay = BGP_UPDATE_DELAY_DEF; bm->v_update_delay = BGP_UPDATE_DELAY_DEFAULT;
bm->v_establish_wait = bm->v_update_delay; bm->v_establish_wait = bm->v_update_delay;
for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) { for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) {
@ -2368,7 +2368,7 @@ static int bgp_update_delay_deconfig_vty(struct vty *vty)
"%%Failed: bgp update-delay configured globally. Delete per-vrf not permitted\n"); "%%Failed: bgp update-delay configured globally. Delete per-vrf not permitted\n");
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
bgp->v_update_delay = BGP_UPDATE_DELAY_DEF; bgp->v_update_delay = BGP_UPDATE_DELAY_DEFAULT;
bgp->v_establish_wait = bgp->v_update_delay; bgp->v_establish_wait = bgp->v_update_delay;
return CMD_SUCCESS; return CMD_SUCCESS;
@ -19346,7 +19346,7 @@ int bgp_config_write(struct vty *vty)
vty_out(vty, "bgp route-map delay-timer %u\n", vty_out(vty, "bgp route-map delay-timer %u\n",
bm->rmap_update_timer); bm->rmap_update_timer);
if (bm->v_update_delay != BGP_UPDATE_DELAY_DEF) { if (bm->v_update_delay != BGP_UPDATE_DELAY_DEFAULT) {
vty_out(vty, "bgp update-delay %d", bm->v_update_delay); vty_out(vty, "bgp update-delay %d", bm->v_update_delay);
if (bm->v_update_delay != bm->v_establish_wait) if (bm->v_update_delay != bm->v_establish_wait)
vty_out(vty, " %d", bm->v_establish_wait); vty_out(vty, " %d", bm->v_establish_wait);

4
bgpd/bgpd.c
View File

@ -8432,8 +8432,8 @@ void bgp_master_init(struct event_loop *master, const int buffer_size,
bm->start_time = monotime(NULL); bm->start_time = monotime(NULL);
bm->t_rmap_update = NULL; bm->t_rmap_update = NULL;
bm->rmap_update_timer = RMAP_DEFAULT_UPDATE_TIMER; bm->rmap_update_timer = RMAP_DEFAULT_UPDATE_TIMER;
bm->v_update_delay = BGP_UPDATE_DELAY_DEF; bm->v_update_delay = BGP_UPDATE_DELAY_DEFAULT;
bm->v_establish_wait = BGP_UPDATE_DELAY_DEF; bm->v_establish_wait = BGP_UPDATE_DELAY_DEFAULT;
bm->terminating = false; bm->terminating = false;
bm->socket_buffer = buffer_size; bm->socket_buffer = buffer_size;
bm->wait_for_fib = false; bm->wait_for_fib = false;

4
bgpd/bgpd.h
View File

@ -489,9 +489,7 @@ struct bgp {
uint32_t restarted_peers; uint32_t restarted_peers;
uint32_t implicit_eors; uint32_t implicit_eors;
uint32_t explicit_eors; uint32_t explicit_eors;
#define BGP_UPDATE_DELAY_DEF 0 #define BGP_UPDATE_DELAY_DEFAULT 0
#define BGP_UPDATE_DELAY_MIN 0
#define BGP_UPDATE_DELAY_MAX 3600
/* Reference bandwidth for BGP link-bandwidth. Used when /* Reference bandwidth for BGP link-bandwidth. Used when
* the LB value has to be computed based on some other * the LB value has to be computed based on some other