diff options
| author | Russ White <russ@riw.us> | 2017-05-10 13:51:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 13:51:47 -0400 |
| commit | 00a1578051ceeb26b0b9c2c3344cac1f202e047d (patch) | |
| tree | 248b55b1ab56e39025d9902c53564286558eda60 /zebra/irdp_main.c | |
| parent | 0896b755080b300116d493444bfc05e2ef7ca9f6 (diff) | |
| parent | c94671b82f790492ceee226f98a65ad7e7e09967 (diff) | |
Merge pull request #408 from qlyoung/remove-thread-macros
*: remove THREAD_ON macros, add nullity check
Diffstat (limited to 'zebra/irdp_main.c')
| -rw-r--r-- | zebra/irdp_main.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c index 7fa4ad4cbe..5c17570f05 100644 --- a/zebra/irdp_main.c +++ b/zebra/irdp_main.c @@ -114,7 +114,8 @@ irdp_sock_init (void) return ret; }; - t_irdp_raw = thread_add_read (zebrad.master, irdp_read_raw, NULL, sock); + t_irdp_raw = NULL; + thread_add_read(zebrad.master, irdp_read_raw, NULL, sock, &t_irdp_raw); return sock; } @@ -244,7 +245,9 @@ int irdp_send_thread(struct thread *t_advert) if(irdp->flags & IF_DEBUG_MISC) zlog_debug("IRDP: New timer for %s set to %u\n", ifp->name, timer); - irdp->t_advertise = thread_add_timer(zebrad.master, irdp_send_thread, ifp, timer); + irdp->t_advertise = NULL; + thread_add_timer(zebrad.master, irdp_send_thread, ifp, timer, + &irdp->t_advertise); return 0; } @@ -296,10 +299,9 @@ void process_solicit (struct interface *ifp) timer = (random () % MAX_RESPONSE_DELAY) + 1; - irdp->t_advertise = thread_add_timer(zebrad.master, - irdp_send_thread, - ifp, - timer); + irdp->t_advertise = NULL; + thread_add_timer(zebrad.master, irdp_send_thread, ifp, timer, + &irdp->t_advertise); } void irdp_finish() |