diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-09-24 09:25:19 -0400 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2015-10-27 10:53:21 +0000 |
| commit | 7125293d65d73a451ec203c8c1630c236171f5a3 (patch) | |
| tree | f9d118c9a8f8374d69fb9c75c87531a2ca478fb2 /pimd/pim_zebra.c | |
| parent | fd1c1a133af47ae5533a5ed41b73ff62e7aa1058 (diff) | |
| download | quagga-7125293d65d73a451ec203c8c1630c236171f5a3.tar.bz2 quagga-7125293d65d73a451ec203c8c1630c236171f5a3.tar.xz | |
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 <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_zebra.c')
| -rw-r--r-- | pimd/pim_zebra.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |