diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-12-20 16:34:04 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-01-04 18:21:00 +0100 |
| commit | 36417fcc20b4a21b26a4e63902caca2eecbad4ed (patch) | |
| tree | da63cbef60f00c6ae2d61ad084ea3cab62d00f5f /pimd/pim_zlookup.c | |
| parent | zebra: Add test and show commands for mlag (diff) | |
| download | frr-36417fcc20b4a21b26a4e63902caca2eecbad4ed.tar.xz frr-36417fcc20b4a21b26a4e63902caca2eecbad4ed.zip | |
pimd: Create a `struct pim_router` and move thread master into it
Create a `struct pim_router` and move the thread master into it.
Future commits will further move global varaibles into the pim_router
structure.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_zlookup.c')
| -rw-r--r-- | pimd/pim_zlookup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 6b4531308..0ffe313c1 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -71,7 +71,7 @@ static int zclient_lookup_connect(struct thread *t) /* Schedule connection with delay. */ static void zclient_lookup_sched(struct zclient *zlookup, int delay) { - thread_add_timer(master, zclient_lookup_connect, zlookup, delay, + thread_add_timer(router->master, zclient_lookup_connect, zlookup, delay, &zlookup->t_connect); zlog_notice("%s: zclient lookup connection scheduled for %d seconds", @@ -81,7 +81,7 @@ static void zclient_lookup_sched(struct zclient *zlookup, int delay) /* Schedule connection for now. */ static void zclient_lookup_sched_now(struct zclient *zlookup) { - thread_add_event(master, zclient_lookup_connect, zlookup, 0, + thread_add_event(router->master, zclient_lookup_connect, zlookup, 0, &zlookup->t_connect); zlog_notice("%s: zclient lookup immediate connection scheduled", @@ -120,7 +120,7 @@ void zclient_lookup_free(void) void zclient_lookup_new(void) { - zlookup = zclient_new(master, &zclient_options_default); + zlookup = zclient_new(router->master, &zclient_options_default); if (!zlookup) { flog_err(EC_LIB_ZAPI_SOCKET, "%s: zclient_new() failure", __PRETTY_FUNCTION__); |