From c0ea1ae701ab984417bd0b8b7b03d1fe3ff1411b Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Tue, 29 May 2018 07:51:41 +0000 Subject: [PATCH] zebra: rebase zserv-mt Signed-off-by: Quentin Young --- zebra/label_manager.c | 2 +- zebra/zebra_pbr.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zebra/label_manager.c b/zebra/label_manager.c index 9bfc4001b..b24a4b68d 100644 --- a/zebra/label_manager.c +++ b/zebra/label_manager.c @@ -99,7 +99,7 @@ static int relay_response_back(void) proto_str = zebra_route_string(proto); /* lookup the client to relay the msg to */ - zserv = zebra_find_client(proto, instance); + zserv = zserv_find_client(proto, instance); if (!zserv) { zlog_err( "Error relaying LM response: can't find client %s, instance %u", diff --git a/zebra/zebra_pbr.c b/zebra/zebra_pbr.c index 6a42aaecb..799b85d4d 100644 --- a/zebra/zebra_pbr.c +++ b/zebra/zebra_pbr.c @@ -30,6 +30,7 @@ #include "zebra/rt.h" #include "zebra/zapi_msg.h" #include "zebra/zebra_memory.h" +#include "zebra/zserv.h" /* definitions */ DEFINE_MTYPE_STATIC(ZEBRA, PBR_IPTABLE_IFNAME, "PBR interface list") @@ -463,7 +464,7 @@ static int zebra_pbr_client_close_cleanup(struct zserv *client) void zebra_pbr_init(void) { - hook_register(zapi_client_close, zebra_pbr_client_close_cleanup); + hook_register(zserv_client_close, zebra_pbr_client_close_cleanup); } static void *pbr_ipset_alloc_intern(void *arg) -- 2.39.2