diff options
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim6_mld.c | 4 | ||||
| -rw-r--r-- | pimd/pim_ifchannel.c | 6 | ||||
| -rw-r--r-- | pimd/pim_time.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pimd/pim6_mld.c b/pimd/pim6_mld.c index 52dbfddd9..5a33fdb26 100644 --- a/pimd/pim6_mld.c +++ b/pimd/pim6_mld.c @@ -1208,7 +1208,7 @@ static void gm_sg_timer_start(struct gm_if *gm_ifp, struct gm_sg *sg, if (sg->t_sg_expire) { struct timeval remain; - remain = thread_timer_remain(sg->t_sg_expire); + remain = event_timer_remain(sg->t_sg_expire); if (timercmp(&remain, &expire_wait, <=)) return; @@ -1316,7 +1316,7 @@ static void gm_handle_q_group(struct gm_if *gm_ifp, if (pend) { struct timeval remain; - remain = thread_timer_remain(pend->t_expire); + remain = event_timer_remain(pend->t_expire); if (timercmp(&remain, &timers->expire_wait, <=)) return; diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 80fc2879c..41b093ab5 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -896,7 +896,7 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, previously received join message with holdtime=0xFFFF. */ if (ch->t_ifjoin_expiry_timer) { - unsigned long remain = thread_timer_remain_second( + unsigned long remain = event_timer_remain_second( ch->t_ifjoin_expiry_timer); if (remain > holdtime) { /* @@ -964,7 +964,7 @@ void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr, pim_ifchannel_ifjoin_handler(ch, pim_ifp); if (ch->t_ifjoin_expiry_timer) { - unsigned long remain = thread_timer_remain_second( + unsigned long remain = event_timer_remain_second( ch->t_ifjoin_expiry_timer); if (remain > holdtime) @@ -1087,7 +1087,7 @@ void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream, * Join/Prune message. */ if (ch->t_ifjoin_expiry_timer) { - unsigned long rem = thread_timer_remain_second( + unsigned long rem = event_timer_remain_second( ch->t_ifjoin_expiry_timer); if (rem > holdtime) diff --git a/pimd/pim_time.c b/pimd/pim_time.c index 23f800cf8..7b10d9114 100644 --- a/pimd/pim_time.c +++ b/pimd/pim_time.c @@ -125,7 +125,7 @@ void pim_time_timer_to_mmss(char *buf, int buf_size, struct event *t_timer) { if (t_timer) { pim_time_mmss(buf, buf_size, - thread_timer_remain_second(t_timer)); + event_timer_remain_second(t_timer)); } else { snprintf(buf, buf_size, "--:--"); } @@ -135,7 +135,7 @@ void pim_time_timer_to_hhmmss(char *buf, int buf_size, struct event *t_timer) { if (t_timer) { pim_time_hhmmss(buf, buf_size, - thread_timer_remain_second(t_timer)); + event_timer_remain_second(t_timer)); } else { snprintf(buf, buf_size, "--:--:--"); } @@ -160,5 +160,5 @@ long pim_time_timer_remain_msec(struct event *t_timer) { /* no timer thread running means timer has expired: return 0 */ - return t_timer ? thread_timer_remain_msec(t_timer) : 0; + return t_timer ? event_timer_remain_msec(t_timer) : 0; } |