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 /ospfd | |
| 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 'ospfd')
| -rw-r--r-- | ospfd/ospf_main.c | 2 | ||||
| -rw-r--r-- | ospfd/ospf_zebra.c | 4 | ||||
| -rw-r--r-- | ospfd/ospf_zebra.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 826fc983..10565fe6 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -298,7 +298,7 @@ main (int argc, char **argv) /* OSPFd inits. */ ospf_if_init (); - ospf_zebra_init (); + ospf_zebra_init (master); /* OSPF vty inits. */ ospf_vty_init (); diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 588f0fb5..cf2ea81f 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -1304,10 +1304,10 @@ ospf_zebra_connected (struct zclient *zclient) } void -ospf_zebra_init () +ospf_zebra_init (struct thread_master *master) { /* Allocate zebra structure. */ - zclient = zclient_new (); + zclient = zclient_new (master); zclient_init (zclient, ZEBRA_ROUTE_OSPF); zclient->zebra_connected = ospf_zebra_connected; zclient->router_id_update = ospf_router_id_update_zebra; diff --git a/ospfd/ospf_zebra.h b/ospfd/ospf_zebra.h index 148f6520..32a02716 100644 --- a/ospfd/ospf_zebra.h +++ b/ospfd/ospf_zebra.h @@ -72,7 +72,7 @@ extern int ospf_distance_set (struct vty *, struct ospf *, const char *, const char *, const char *); extern int ospf_distance_unset (struct vty *, struct ospf *, const char *, const char *, const char *); -extern void ospf_zebra_init (void); +extern void ospf_zebra_init (struct thread_master *); #endif /* _ZEBRA_OSPF_ZEBRA_H */ |