zebra: rebase zserv-mt

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index 9bfc4001b66aa7a557ec458750194971a7858384..b24a4b68dc0d7b2e97fb3c4baa9e81013ac9e9c3 100644 (file)
--- 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 6a42aaecb464db307dc2bc65e31b374a5f56965d..799b85d4d1fb85821374606fc5e51e4a06f39061 100644 (file)
--- 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)