diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-08-03 14:18:11 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-08-03 14:22:45 +0200 |
| commit | 8619629ada22ed19eb95d491799cc03a13d6d8aa (patch) | |
| tree | 856dd0a838a555b2a909dfe939f91d8852df805c /ospf6d | |
| parent | pimd: On shutdown ensure wheel exists (diff) | |
| download | frr-8619629ada22ed19eb95d491799cc03a13d6d8aa.tar.xz frr-8619629ada22ed19eb95d491799cc03a13d6d8aa.zip | |
lib, bgpd, ospf6d, ospfd, pimd: Allow finish to cleanup a bit more
When calling route_map_finish, every place that we do we must
first set the deletion event to NULL, or we will create an infinite
loop, if we are using the delayed route-map application code.
As such we might as well just make the route_map_finish code
do this work, as that there is really no viable alternative here
and route_map_finish should only be called on shutdown.
This fixes an infinite loop in zebra on shutdown when there
are route-maps.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'ospf6d')
| -rw-r--r-- | ospf6d/ospf6_asbr.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index e6bd3faf4..5af88defe 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -1861,9 +1861,6 @@ void ospf6_asbr_redistribute_reset(void) void ospf6_asbr_terminate(void) { /* Cleanup route maps */ - route_map_add_hook(NULL); - route_map_delete_hook(NULL); - route_map_event_hook(NULL); route_map_finish(); } |