Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New tests #18

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

New tests #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14b5c78
bgpd: Remove BGP_UPDATE_DELAY_MIN/MAX
ton31337 Aug 7, 2024
d304714
Merge pull request #16525 from opensourcerouting/fix/remove_BGP_UPDAT…
donaldsharp Aug 7, 2024
6c955a9
memory leak
rzalamena Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions bgpd/bgp_vty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
* 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)) {
if (bgp->v_update_delay != BGP_UPDATE_DELAY_DEF) {
if (bgp->v_update_delay != BGP_UPDATE_DELAY_DEFAULT) {
vty_out(vty,
"%% update-delay configuration found in vrf %s\n",
bgp->inst_type == BGP_INSTANCE_TYPE_DEFAULT
Expand Down Expand Up @@ -2314,7 +2314,7 @@ static int bgp_global_update_delay_deconfig_vty(struct vty *vty)
struct listnode *node, *nnode;
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;

for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) {
Expand Down Expand Up @@ -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");
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;

return CMD_SUCCESS;
Expand Down Expand Up @@ -16258,7 +16258,6 @@ static int bgp_show_neighbor_vty(struct vty *vty, const char *name,
bgp_show_neighbor(vty, bgp, type, NULL, NULL, use_json,
json);
}
json_object_free(json);
} else {
if (use_json)
vty_out(vty, "{}\n");
Expand Down Expand Up @@ -19346,7 +19345,7 @@ int bgp_config_write(struct vty *vty)
vty_out(vty, "bgp route-map delay-timer %u\n",
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);
if (bm->v_update_delay != bm->v_establish_wait)
vty_out(vty, " %d", bm->v_establish_wait);
Expand Down
4 changes: 2 additions & 2 deletions bgpd/bgpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8432,8 +8432,8 @@ void bgp_master_init(struct event_loop *master, const int buffer_size,
bm->start_time = monotime(NULL);
bm->t_rmap_update = NULL;
bm->rmap_update_timer = RMAP_DEFAULT_UPDATE_TIMER;
bm->v_update_delay = BGP_UPDATE_DELAY_DEF;
bm->v_establish_wait = BGP_UPDATE_DELAY_DEF;
bm->v_update_delay = BGP_UPDATE_DELAY_DEFAULT;
bm->v_establish_wait = BGP_UPDATE_DELAY_DEFAULT;
bm->terminating = false;
bm->socket_buffer = buffer_size;
bm->wait_for_fib = false;
Expand Down
4 changes: 1 addition & 3 deletions bgpd/bgpd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,9 +489,7 @@ struct bgp {
uint32_t restarted_peers;
uint32_t implicit_eors;
uint32_t explicit_eors;
#define BGP_UPDATE_DELAY_DEF 0
#define BGP_UPDATE_DELAY_MIN 0
#define BGP_UPDATE_DELAY_MAX 3600
#define BGP_UPDATE_DELAY_DEFAULT 0

/* Reference bandwidth for BGP link-bandwidth. Used when
* the LB value has to be computed based on some other
Expand Down
Loading