summaryrefslogtreecommitdiff
path: root/zebra/zserv.c
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@users.noreply.github.com>2020-03-04 23:40:26 -0500
committerGitHub <noreply@github.com>2020-03-04 23:40:26 -0500
commitca8a844cc5cd94932b40d0b55fe051cf3e6e6687 (patch)
treec802c396e446c37403f7a9d18ed52afec19b5c8e /zebra/zserv.c
parentea16e190800fc5cf1929b5bb73f0519978ff2072 (diff)
parent6f4aee61a2e741b8ba6f91b5922ddafafda5b587 (diff)
Merge pull request #5850 from Spantik/gr_fix
Zebra: Zebra gr dynamic client handling
Diffstat (limited to 'zebra/zserv.c')
-rw-r--r--zebra/zserv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 2a5352a1da..299c079df1 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -568,7 +568,7 @@ static void zserv_client_free(struct zserv *client)
close(client->sock);
- if (!client->gr_instance_count) {
+ if (DYNAMIC_CLIENT_GR_DISABLED(client)) {
nroutes = rib_score_proto(client->proto,
client->instance);
zlog_notice(
@@ -610,7 +610,7 @@ static void zserv_client_free(struct zserv *client)
* If any instance are graceful restart enabled,
* client is not deleted
*/
- if (!client->gr_instance_count) {
+ if (DYNAMIC_CLIENT_GR_DISABLED(client)) {
if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug("%s: Deleting client %s", __func__,
zebra_route_string(client->proto));