diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-09-23 13:26:56 -0700 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-09-23 13:26:56 -0700 |
| commit | 4140ca4d153e8949afd6abc9e00fbbac3d47799c (patch) | |
| tree | e21a92656dd140a433ce626128fc89801ef926a2 /ospfd/ospf_zebra.c | |
| parent | c006e89e9ae894f5e078cc53146e09225b53cc6f (diff) | |
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 'ospfd/ospf_zebra.c')
| -rw-r--r-- | ospfd/ospf_zebra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 2bc46ca878..fff38a34a3 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -1530,10 +1530,10 @@ ospf_distance_apply (struct prefix_ipv4 *p, struct ospf_route *or) } void -ospf_zebra_init (u_short instance) +ospf_zebra_init (struct thread_master *master, u_short instance) { /* Allocate zebra structure. */ - zclient = zclient_new (); + zclient = zclient_new(master); zclient_init (zclient, ZEBRA_ROUTE_OSPF, instance); zclient->router_id_update = ospf_router_id_update_zebra; zclient->interface_add = ospf_interface_add; |
