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

bgpd: Clean address-family config on daemon restart #17716

Merged
merged 1 commit into from
Jan 1, 2025
Merged

bgpd: Clean address-family config on daemon restart #17716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions bgpd/bgp_route.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15778,6 +15778,28 @@ static int bgp_distance_unset(struct vty *vty, const char *distance_str,
return CMD_SUCCESS;
}

void bgp_address_family_distance_delete(void)
{
afi_t afi = AFI_UNSPEC;
safi_t safi = SAFI_UNSPEC;
struct bgp_dest *dest = NULL;
struct bgp_distance *bdistance = NULL;

FOREACH_AFI_SAFI (afi, safi) {
for (dest = bgp_table_top(bgp_distance_table[afi][safi]); dest;
dest = bgp_route_next(dest)) {
if (!bgp_dest_has_bgp_path_info_data(dest))
continue;
bdistance = bgp_dest_get_bgp_distance_info(dest);
XFREE(MTYPE_AS_LIST, bdistance->access_list);
bgp_distance_free(bdistance);

bgp_dest_set_bgp_distance_info(dest, NULL);
bgp_dest_unlock_node(dest);
}
}
}

/* Apply BGP information to distance method. */
uint8_t bgp_distance_apply(const struct prefix *p, struct bgp_path_info *pinfo,
afi_t afi, safi_t safi, struct bgp *bgp)
Expand Down
1 change: 1 addition & 0 deletions bgpd/bgp_route.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,7 @@ extern void bgp_redistribute_withdraw(struct bgp *, afi_t, int, unsigned short);

extern void bgp_static_add(struct bgp *);
extern void bgp_static_delete(struct bgp *);
extern void bgp_address_family_distance_delete(void);
extern void bgp_static_redo_import_check(struct bgp *);
extern void bgp_purge_static_redist_routes(struct bgp *bgp);
extern void bgp_static_update(struct bgp *bgp, const struct prefix *p,
Expand Down
8 changes: 8 additions & 0 deletions bgpd/bgpd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4237,6 +4237,14 @@ int bgp_delete(struct bgp *bgp)
}
}

/* Clean BGP address family parameters */
bgp_mh_info->ead_evi_rx = BGP_EVPN_MH_EAD_EVI_RX_DEF;
bgp_evpn_switch_ead_evi_rx();
bgp_mh_info->ead_evi_tx = BGP_EVPN_MH_EAD_EVI_TX_DEF;
bgp_mh_info->evi_per_es_frag = BGP_EVPN_MAX_EVI_PER_ES_FRAG;

bgp_address_family_distance_delete();

return 0;
}

Expand Down
Loading