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_neighbor.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_neighbor.c')
| -rw-r--r-- | pimd/pim_neighbor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c index f40262965..4f06daf31 100644 --- a/pimd/pim_neighbor.c +++ b/pimd/pim_neighbor.c @@ -255,8 +255,8 @@ void pim_neighbor_timer_reset(struct pim_neighbor *neigh, uint16_t holdtime) neigh->interface->name); } - thread_add_timer(master, on_neighbor_timer, neigh, neigh->holdtime, - &neigh->t_expire_timer); + thread_add_timer(router->master, on_neighbor_timer, neigh, + neigh->holdtime, &neigh->t_expire_timer); } static int on_neighbor_jp_timer(struct thread *t) @@ -277,8 +277,8 @@ static int on_neighbor_jp_timer(struct thread *t) rpf.rpf_addr.u.prefix4 = neigh->source_addr; pim_joinprune_send(&rpf, neigh->upstream_jp_agg); - thread_add_timer(master, on_neighbor_jp_timer, neigh, qpim_t_periodic, - &neigh->jp_timer); + thread_add_timer(router->master, on_neighbor_jp_timer, neigh, + qpim_t_periodic, &neigh->jp_timer); return 0; } @@ -286,8 +286,8 @@ static int on_neighbor_jp_timer(struct thread *t) static void pim_neighbor_start_jp_timer(struct pim_neighbor *neigh) { THREAD_TIMER_OFF(neigh->jp_timer); - thread_add_timer(master, on_neighbor_jp_timer, neigh, qpim_t_periodic, - &neigh->jp_timer); + thread_add_timer(router->master, on_neighbor_jp_timer, neigh, + qpim_t_periodic, &neigh->jp_timer); } static struct pim_neighbor * |