Mercurial > hg > dhcpcd
changeset 4935:978c1d5b04e8 draft
inet6: Use milliseconds rather than timespec for calculating delays
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Sat, 04 Jan 2020 07:26:04 +0000 |
| parents | 64d2e5e77cc3 |
| children | bc83063dc5ef |
| files | src/ipv6.c |
| diffstat | 1 files changed, 8 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ipv6.c Sat Jan 04 07:20:50 2020 +0000 +++ b/src/ipv6.c Sat Jan 04 07:26:04 2020 +0000 @@ -568,11 +568,8 @@ &ia->addr, ia->prefix_len, flags, 0); } else { /* Still tentative? Check again in a bit. */ - struct timespec tv; - - ms_to_ts(&tv, RETRANS_TIMER / 2); - eloop_timeout_add_tv(ia->iface->ctx->eloop, &tv, - ipv6_checkaddrflags, ia); + eloop_timeout_add_msec(ia->iface->ctx->eloop, + RETRANS_TIMER / 2, ipv6_checkaddrflags, ia); } } #endif @@ -746,11 +743,8 @@ eloop_timeout_delete(ifp->ctx->eloop, ipv6_checkaddrflags, ia); if (!(ia->flags & IPV6_AF_DADCOMPLETED)) { - struct timespec tv; - - ms_to_ts(&tv, RETRANS_TIMER / 2); - eloop_timeout_add_tv(ifp->ctx->eloop, - &tv, ipv6_checkaddrflags, ia); + eloop_timeout_add_msec(ifp->ctx->eloop, + RETRANS_TIMER / 2, ipv6_checkaddrflags, ia); } #endif @@ -1208,12 +1202,9 @@ if (IN6_IS_ADDR_LINKLOCAL(&ia->addr) || ia->dadcallback) { #ifdef IPV6_POLLADDRFLAG if (ia->addr_flags & IN6_IFF_TENTATIVE) { - struct timespec tv; - - ms_to_ts(&tv, RETRANS_TIMER / 2); - eloop_timeout_add_tv( + eloop_timeout_add_msec( ia->iface->ctx->eloop, - &tv, ipv6_checkaddrflags, ia); + RETRANS_TIMER / 2, ipv6_checkaddrflags, ia); break; } #endif @@ -1510,12 +1501,9 @@ if (ia != NULL) { #ifdef IPV6_POLLADDRFLAG if (ia->addr_flags & IN6_IFF_TENTATIVE) { - struct timespec tv; - - ms_to_ts(&tv, RETRANS_TIMER / 2); - eloop_timeout_add_tv( + eloop_timeout_add_msec( ia->iface->ctx->eloop, - &tv, ipv6_checkaddrflags, ia); + RETRANS_TIMER / 2, ipv6_checkaddrflags, ia); } #endif return 0;