diff options
Diffstat (limited to 'ldpd/ldpe.c')
| -rw-r--r-- | ldpd/ldpe.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c index 2e6acd8d05..d3193b16d7 100644 --- a/ldpd/ldpe.c +++ b/ldpd/ldpe.c @@ -200,7 +200,7 @@ ldpe_shutdown(void) #ifdef __OpenBSD__ if (sysdep.no_pfkey == 0) { - THREAD_OFF(pfkey_ev); + EVENT_OFF(pfkey_ev); close(global.pfkeysock); } #endif @@ -273,7 +273,7 @@ static void ldpe_dispatch_main(struct event *thread) struct l2vpn_pw *pw, *npw; struct imsg imsg; int fd; - struct imsgev *iev = THREAD_ARG(thread); + struct imsgev *iev = EVENT_ARG(thread); struct imsgbuf *ibuf = &iev->ibuf; struct iface *iface = NULL; struct kif *kif; @@ -615,8 +615,8 @@ static void ldpe_dispatch_main(struct event *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - THREAD_OFF(iev->ev_read); - THREAD_OFF(iev->ev_write); + EVENT_OFF(iev->ev_read); + EVENT_OFF(iev->ev_write); ldpe_shutdown(); } } @@ -624,7 +624,7 @@ static void ldpe_dispatch_main(struct event *thread) /* ARGSUSED */ static void ldpe_dispatch_lde(struct event *thread) { - struct imsgev *iev = THREAD_ARG(thread); + struct imsgev *iev = EVENT_ARG(thread); struct imsgbuf *ibuf = &iev->ibuf; struct imsg imsg; struct map *map; @@ -751,8 +751,8 @@ static void ldpe_dispatch_lde(struct event *thread) imsg_event_add(iev); else { /* this pipe is dead, so remove the event handlers and exit */ - THREAD_OFF(iev->ev_read); - THREAD_OFF(iev->ev_write); + EVENT_OFF(iev->ev_read); + EVENT_OFF(iev->ev_write); ldpe_shutdown(); } } @@ -761,7 +761,7 @@ static void ldpe_dispatch_lde(struct event *thread) /* ARGSUSED */ static void ldpe_dispatch_pfkey(struct event *thread) { - int fd = THREAD_FD(thread); + int fd = EVENT_FD(thread); event_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock, &pfkey_ev); @@ -802,14 +802,14 @@ ldpe_close_sockets(int af) af_global = ldp_af_global_get(&global, af); /* discovery socket */ - THREAD_OFF(af_global->disc_ev); + EVENT_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_OFF(af_global->edisc_ev); + EVENT_OFF(af_global->edisc_ev); if (af_global->ldp_edisc_socket != -1) { close(af_global->ldp_edisc_socket); af_global->ldp_edisc_socket = -1; |