diff options
Diffstat (limited to 'ldpd/ldpe.c')
| -rw-r--r-- | ldpd/ldpe.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c index 29abd420e5..792dcb2f2a 100644 --- a/ldpd/ldpe.c +++ b/ldpd/ldpe.c @@ -212,7 +212,7 @@ ldpe_shutdown(void) #ifdef __OpenBSD__ if (sysdep.no_pfkey == 0) { - thread_cancel(&pfkey_ev); + THREAD_OFF(pfkey_ev); close(global.pfkeysock); } #endif @@ -626,8 +626,8 @@ static void ldpe_dispatch_main(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - thread_cancel(&iev->ev_read); - thread_cancel(&iev->ev_write); + THREAD_OFF(iev->ev_read); + THREAD_OFF(iev->ev_write); ldpe_shutdown(); } } @@ -762,8 +762,8 @@ static void ldpe_dispatch_lde(struct thread *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - thread_cancel(&iev->ev_read); - thread_cancel(&iev->ev_write); + THREAD_OFF(iev->ev_read); + THREAD_OFF(iev->ev_write); ldpe_shutdown(); } } @@ -813,14 +813,14 @@ ldpe_close_sockets(int af) af_global = ldp_af_global_get(&global, af); /* discovery socket */ - thread_cancel(&af_global->disc_ev); + THREAD_OFF(af_global->disc_ev); if (af_global->ldp_disc_socket != -1) { close(af_global->ldp_disc_socket); af_global->ldp_disc_socket = -1; } /* extended discovery socket */ - thread_cancel(&af_global->edisc_ev); + THREAD_OFF(af_global->edisc_ev); if (af_global->ldp_edisc_socket != -1) { close(af_global->ldp_edisc_socket); af_global->ldp_edisc_socket = -1; |