diff options
Diffstat (limited to 'ldpd/interface.c')
| -rw-r--r-- | ldpd/interface.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ldpd/interface.c b/ldpd/interface.c index 5d1859298e..ad5d853b65 100644 --- a/ldpd/interface.c +++ b/ldpd/interface.c @@ -22,7 +22,7 @@ static struct if_addr *if_addr_lookup(struct if_addr_head *, struct kaddr *); static int if_start(struct iface *, int); static int if_reset(struct iface *, int); static void if_update_af(struct iface_af *); -static void if_hello_timer(struct thread *thread); +static void if_hello_timer(struct event *thread); static void if_start_hello_timer(struct iface_af *); static void if_stop_hello_timer(struct iface_af *); static int if_join_ipv4_group(struct iface *, struct in_addr *); @@ -32,7 +32,7 @@ static int if_leave_ipv6_group(struct iface *, struct in6_addr *); static int ldp_sync_fsm_init(struct iface *iface, int state); static int ldp_sync_act_iface_start_sync(struct iface *iface); -static void iface_wait_for_ldp_sync_timer(struct thread *thread); +static void iface_wait_for_ldp_sync_timer(struct event *thread); static void start_wait_for_ldp_sync_timer(struct iface *iface); static void stop_wait_for_ldp_sync_timer(struct iface *iface); static int ldp_sync_act_ldp_start_sync(struct iface *iface); @@ -444,9 +444,9 @@ if_get_wait_for_sync_interval(void) /* timers */ /* ARGSUSED */ -static void if_hello_timer(struct thread *thread) +static void if_hello_timer(struct event *thread) { - struct iface_af *ia = THREAD_ARG(thread); + struct iface_af *ia = EVENT_ARG(thread); ia->hello_timer = NULL; send_hello(HELLO_LINK, ia, NULL); @@ -456,15 +456,15 @@ static void if_hello_timer(struct thread *thread) static void if_start_hello_timer(struct iface_af *ia) { - THREAD_OFF(ia->hello_timer); - thread_add_timer(master, if_hello_timer, ia, if_get_hello_interval(ia), - &ia->hello_timer); + EVENT_OFF(ia->hello_timer); + event_add_timer(master, if_hello_timer, ia, if_get_hello_interval(ia), + &ia->hello_timer); } static void if_stop_hello_timer(struct iface_af *ia) { - THREAD_OFF(ia->hello_timer); + EVENT_OFF(ia->hello_timer); } struct ctl_iface * @@ -533,7 +533,7 @@ ldp_sync_to_ctl(struct iface *iface) ictl.timer_running = iface->ldp_sync.wait_for_sync_timer ? true : false; ictl.wait_time_remaining = - thread_timer_remain_second(iface->ldp_sync.wait_for_sync_timer); + event_timer_remain_second(iface->ldp_sync.wait_for_sync_timer); memset(&ictl.peer_ldp_id, 0, sizeof(ictl.peer_ldp_id)); @@ -720,9 +720,9 @@ ldp_sync_act_iface_start_sync(struct iface *iface) return (0); } -static void iface_wait_for_ldp_sync_timer(struct thread *thread) +static void iface_wait_for_ldp_sync_timer(struct event *thread) { - struct iface *iface = THREAD_ARG(thread); + struct iface *iface = EVENT_ARG(thread); ldp_sync_fsm(iface, LDP_SYNC_EVT_LDP_SYNC_COMPLETE); } @@ -732,15 +732,15 @@ static void start_wait_for_ldp_sync_timer(struct iface *iface) if (iface->ldp_sync.wait_for_sync_timer) return; - THREAD_OFF(iface->ldp_sync.wait_for_sync_timer); - thread_add_timer(master, iface_wait_for_ldp_sync_timer, iface, + EVENT_OFF(iface->ldp_sync.wait_for_sync_timer); + event_add_timer(master, iface_wait_for_ldp_sync_timer, iface, if_get_wait_for_sync_interval(), &iface->ldp_sync.wait_for_sync_timer); } static void stop_wait_for_ldp_sync_timer(struct iface *iface) { - THREAD_OFF(iface->ldp_sync.wait_for_sync_timer); + EVENT_OFF(iface->ldp_sync.wait_for_sync_timer); } static int |