matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

babel: Clean babel related config on daemon stop

Browse source 
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>
This commit is contained in:
Yaroslav Kholod 2024-12-23 13:06:57 +02:00
parent 61ba8b91e5
commit a05c6af88f
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
babeld/babel_interface.c
View file

@ -719,6 +719,7 @@ babel_interface_close_all(void)
{ {
struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT);
struct interface *ifp = NULL; struct interface *ifp = NULL;
int type;
FOR_ALL_INTERFACES(vrf, ifp) { FOR_ALL_INTERFACES(vrf, ifp) {
if(!if_up(ifp)) if(!if_up(ifp))
@ -740,8 +741,14 @@ babel_interface_close_all(void)
flushbuf(ifp); flushbuf(ifp);
usleep(roughly(10000)); usleep(roughly(10000));
gettime(&babel_now); gettime(&babel_now);
babel_enable_if_delete(ifp->name);
interface_reset(ifp); interface_reset(ifp);
} }
/* Disable babel redistribution */
for (type = 0; type < ZEBRA_ROUTE_MAX; type++) {
zclient_redistribute (ZEBRA_REDISTRIBUTE_DELETE, zclient, AFI_IP, type, 0, VRF_DEFAULT);
zclient_redistribute (ZEBRA_REDISTRIBUTE_DELETE, zclient, AFI_IP6, type, 0, VRF_DEFAULT);
}
} }
/* return "true" if address is one of our ipv6 addresses */ /* return "true" if address is one of our ipv6 addresses */