From 7125293d65d73a451ec203c8c1630c236171f5a3 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 24 Sep 2015 09:25:19 -0400 Subject: lib: zclient.c remove extern struct thread_master * zclient.c depended upon link time inclusion of a extern struct thread_master *master. This is a violation of the namespace of the calling daemon. If a library needs the pointer pass it in and save it for future use. This code change also makes the zclient code consistent with the other lib functions that need to schedule work on your behalf Signed-off-by: Donald Sharp --- pimd/pim_zebra.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pimd/pim_zebra.c') diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index dfc871b3..1a392713 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -655,7 +655,7 @@ static void pim_zebra_connected(struct zclient *zclient) zclient_send_requests(zclient, VRF_DEFAULT); } -void pim_zebra_init(char *zebra_sock_path) +void pim_zebra_init (struct thread_master *master, char *zebra_sock_path) { int i; @@ -669,7 +669,7 @@ void pim_zebra_init(char *zebra_sock_path) #endif /* Socket for receiving updates from Zebra daemon */ - qpim_zclient_update = zclient_new(); + qpim_zclient_update = zclient_new (master); qpim_zclient_update->zebra_connected = pim_zebra_connected; qpim_zclient_update->router_id_update = pim_router_id_update_zebra; -- cgit v1.2.3