babel: Clean babel related config on daemon stop #17715
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
When disable and enable babel router network configurations are still present. This is an issue, cause it disrupts normal babel router usage. |
ton31337
reviewed
Dec 31, 2024
babeld/babeld.c
Outdated
| @@ -310,6 +314,17 @@ void babel_clean_routing_process(void) | |||
| resend_delay = BABEL_DEFAULT_RESEND_DELAY; | |||
| change_smoothing_half_life(BABEL_DEFAULT_SMOOTHING_HALF_LIFE); | |||
|
|
|||
| /* Clean babel network interfaces */ | |||
| FOR_ALL_INTERFACES(vrf, ifp) { | |||
There was a problem hiding this comment.
Shouldn't we do this inside babel_interface_close_all()?
ykholod
force-pushed
the
master-17413-1
branch
from
74fdb08 to
cfe7160
Compare
ykholod
force-pushed
the
master-17413-1
branch
from
cfe7160 to
e5387fd
Compare
ton31337
requested changes
Jan 2, 2025
babeld/babel_interface.c
Outdated
| interface_reset(ifp); | ||
| } | ||
| /* Disable babel redistribution */ | ||
| for (type = 0; type < ZEBRA_ROUTE_MAX; type++) { | ||
| zclient_redistribute (ZEBRA_REDISTRIBUTE_DELETE, zclient, family2afi(AF_INET), type, 0, VRF_DEFAULT); |
There was a problem hiding this comment.
Makes no difference to me. Fixed
babeld/babel_interface.c
Outdated
| /* Disable babel redistribution */ | ||
| for (type = 0; type < ZEBRA_ROUTE_MAX; type++) { | ||
| zclient_redistribute (ZEBRA_REDISTRIBUTE_DELETE, zclient, family2afi(AF_INET), type, 0, VRF_DEFAULT); | ||
| zclient_redistribute (ZEBRA_REDISTRIBUTE_DELETE, zclient, family2afi(AF_INET6), type, 0, VRF_DEFAULT); |
There was a problem hiding this comment.
Makes no difference to me. Fixed
babeld/babel_interface.c
Outdated
| @@ -719,6 +719,7 @@ babel_interface_close_all(void) | |||
| { | |||
| struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); | |||
| struct interface *ifp = NULL; | |||
| int type = ZEBRA_ROUTE_ALL; | |||
There was a problem hiding this comment.
We don't need initialization here at all, because we do it inside the loop.
There was a problem hiding this comment.
Cause I am afraid of uninitialized variables, regardless compiler settings
Fixed
When deactivating babel no router babel and later re-enabling it router babel the previous configuration is still in place.
Steps to reproduce:
Enable babel
Configure babel
Disable babel with "no router babel"
Verify config
Expected correct behavior: No config present
Signed-off-by: Yaroslav Kholod <y.kholod@vyos.io>
ykholod
force-pushed
the
master-17413-1
branch
from
e5387fd to
a05c6af
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When deactivating babel no router babel and later re-enabling it router babel the previous configuration is still in place.
Steps to reproduce:
Expected correct behavior: No config present