bgpd: Clean address-family config on daemon restart #17716
Conversation
ykholod
changed the title
|
Fixing issue #17463 |
bgpd/bgp_route.c
Outdated
| @@ -15778,6 +15778,30 @@ static int bgp_distance_unset(struct vty *vty, const char *distance_str, | |||
| return CMD_SUCCESS; | |||
| } | |||
|
|
|||
| int bgp_address_family_distance_clean() | |||
There was a problem hiding this comment.
Please use the same pattern as bgp_static_delete(). More/less identical except for some adjustments.
There was a problem hiding this comment.
I meant not only void(), but the structure, macros, logic inside also.
ykholod
force-pushed
the
master-17463
branch
from
46919e9 to
98a6754
Compare
bgpd/bgp_route.h
Outdated
| @@ -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_clean(); | |||
There was a problem hiding this comment.
Can we name it also ..._delete()?
bgpd/bgpd.c
Outdated
| @@ -4237,6 +4237,14 @@ int bgp_delete(struct bgp *bgp) | |||
| } | |||
| } | |||
|
|
|||
| // Clean BGP address family parameters | |||
There was a problem hiding this comment.
Please drop this comment or replace with /* */.
bgpd/bgp_route.c
Outdated
| struct bgp_dest *dest = NULL; | ||
| struct bgp_distance *bdistance = NULL; | ||
|
|
||
| for (afi=AFI_IP;afi<AFI_MAX;afi++) { |
There was a problem hiding this comment.
Let's use FOREACH_AFI_SAFI macro, see bgp_static_delete().
ykholod
force-pushed
the
master-17463
branch
from
98a6754 to
3962f21
Compare
bgpd/bgp_route.h
Outdated
| @@ -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(); | |||
There was a problem hiding this comment.
Please use extern void bgp_address_family_distance_delete(void);
bgpd/bgp_route.c
Outdated
| @@ -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() | |||
There was a problem hiding this comment.
void bgp_address_family_distance_delete(void), please.
bgpd/bgp_route.c
Outdated
| XFREE(MTYPE_AS_LIST, bdistance->access_list); | ||
| bgp_distance_free(bdistance); | ||
|
|
||
| bgp_dest_set_bgp_path_info(dest, NULL); |
There was a problem hiding this comment.
We should use bgp_dest_set_bgp_distance_info() here.
|
Also, please take a look at frrbot and |
When stopping and restarting BGP daemon part of the configuration remains. It should be cleared. Particulary those are address-family parametes, like: distance, ead-es-frag, disable-ead-evi-rx, disable-ead-evi-tx. Signed-off-by: Yaroslav Kholod <[email protected]>
ykholod
force-pushed
the
master-17463
branch
from
3962f21 to
663281c
Compare
|
Sorry for the mess. |
When stopping and restarting BGP daemon part of the configuration remains. It should be cleared.
Particulary those are address-family parametes, like: distance, ead-es-frag, disable-ead-evi-rx, disable-ead-evi-tx.