diff options
| -rw-r--r-- | zebra/zebra_gr.c | 10 | ||||
| -rw-r--r-- | zebra/zserv.c | 6 | ||||
| -rw-r--r-- | zebra/zserv.h | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/zebra/zebra_gr.c b/zebra/zebra_gr.c index f4241f1d72..cee66cc055 100644 --- a/zebra/zebra_gr.c +++ b/zebra/zebra_gr.c @@ -298,6 +298,16 @@ struct zebra_gr_afi_clean { * Functions to deal with capabilities */ +void zebra_gr_client_final_shutdown(struct zserv *client) +{ + struct client_gr_info *info; + + while (!TAILQ_EMPTY(&client->gr_info_queue)) { + info = TAILQ_FIRST(&client->gr_info_queue); + zebra_gr_client_info_delete(client, info); + } +} + /* * Function to decode and call appropriate functions * to handle client capabilities. diff --git a/zebra/zserv.c b/zebra/zserv.c index 3671fdb507..e2681289b1 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -675,10 +675,14 @@ static void zserv_client_free(struct zserv *client) * If any instance are graceful restart enabled, * client is not deleted */ - if (DYNAMIC_CLIENT_GR_DISABLED(client)) { + if (DYNAMIC_CLIENT_GR_DISABLED(client) || zebra_router_in_shutdown()) { if (IS_ZEBRA_DEBUG_EVENT) zlog_debug("%s: Deleting client %s", __func__, zebra_route_string(client->proto)); + + if (zebra_router_in_shutdown()) + zebra_gr_client_final_shutdown(client); + zserv_client_delete(client); } else { /* Handle cases where client has GR instance. */ diff --git a/zebra/zserv.h b/zebra/zserv.h index e1c990fb05..57d673060f 100644 --- a/zebra/zserv.h +++ b/zebra/zserv.h @@ -378,6 +378,7 @@ __attribute__((__noreturn__)) void zebra_finalize(struct event *event); /* * Graceful restart functions. */ +extern void zebra_gr_client_final_shutdown(struct zserv *client); extern int zebra_gr_client_disconnect(struct zserv *client); extern void zebra_gr_client_reconnect(struct zserv *client); extern void zebra_gr_stale_client_cleanup(struct list *client_list); |