Normalise timing

diff --git a/common.h b/common.h
index f2a894ef817bbe959571ac887bfc2f504bf9616f..37b7a2c8703dce3faeadec8e0c9a9514e30f3ce2 100644 (file)
--- a/common.h
+++ b/common.h
@@ -37,23 +37,27 @@
 #define UNCONST(a)             ((void *)(unsigned long)(const void *)(a))
 
 #define timeval_to_double(tv) ((tv)->tv_sec * 1.0 + (tv)->tv_usec * 1.0e-6)
-#define tv_to_ms(ms, tv)                                               \
-       do {                                                            \
-               ms = (tv)->tv_sec * 1000;                               \
-               ms += (tv)->tv_usec / 1000;                             \
-       } while (0 /* CONSTCOND */);
-#define ms_to_tv(tv, ms)                                               \
-       do {                                                            \
-               (tv)->tv_sec = ms / 1000;                               \
-               (tv)->tv_usec = (ms - (tv)->tv_sec * 1000) * 1000;      \
-       } while (0 /* CONSTCOND */);
-#define timernorm(tvp)                                                 \
-       do {                                                            \
-               while ((tvp)->tv_usec >= 1000000) {                     \
-                       (tvp)->tv_sec++;                                \
-                       (tvp)->tv_usec -= 1000000;                      \
-               }                                                       \
-       } while (0 /* CONSTCOND */);
+#define timernorm(tv) do {                                             \
+       while ((tv)->tv_usec >= 1000000) {                              \
+               (tv)->tv_sec++;                                         \
+               (tv)->tv_usec -= 1000000;                               \
+       }                                                               \
+} while (0 /* CONSTCOND */);
+#define tv_to_ms(ms, tv) do {                                          \
+       ms = (tv)->tv_sec * 1000;                                       \
+       ms += (tv)->tv_usec / 1000;                                     \
+} while (0 /* CONSTCOND */);
+#define ms_to_tv(tv, ms) do {                                          \
+       (tv)->tv_sec = ms / 1000;                                       \
+       (tv)->tv_usec = (ms - ((tv)->tv_sec * 1000)) * 1000;            \
+} while (0 /* CONSTCOND */);
+
+#ifndef TIMEVAL_TO_TIMESPEC
+#define        TIMEVAL_TO_TIMESPEC(tv, ts) do {                                \
+       (ts)->tv_sec = (tv)->tv_sec;                                    \
+       (ts)->tv_nsec = (tv)->tv_usec * 1000;                           \
+} while (0 /* CONSTCOND */)
+#endif
 
 #if __GNUC__ > 2 || defined(__INTEL_COMPILER)
 # define _noreturn __attribute__((__noreturn__))

diff --git a/dhcpcd.c b/dhcpcd.c
index c219a5649f4283e7319b786362ac1abd049ec61c..238491930ffe5d99821e437a0398f418ffa8de70 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -330,6 +330,7 @@ send_message(struct interface *iface, int type,
                }
                tv.tv_sec = state->interval + DHCP_RAND_MIN;
                tv.tv_usec = arc4random() % (DHCP_RAND_MAX_U - DHCP_RAND_MIN_U);
+               timernorm(&tv);
                syslog(LOG_DEBUG,
                    "%s: sending %s (xid 0x%x), next in %0.2f seconds",
                    iface->name, get_dhcp_op(type), state->xid,

diff --git a/eloop.c b/eloop.c
index 85219780a0fffd7cb4796d50f42f721dc4d8ec6f..9a28890ff6fb9aa43fc901744c247d1ff70a9759 100644 (file)
--- a/eloop.c
+++ b/eloop.c
@@ -309,8 +309,7 @@ eloop_start(const sigset_t *cursigs)
                                continue;
                        }
                        timersub(&timeouts->when, &now, &tv);
-                       ts.tv_sec = tv.tv_sec;
-                       ts.tv_nsec = tv.tv_usec * 1000;
+                       TIMEVAL_TO_TIMESPEC(&tv, &ts);
                        tsp = &ts;
                } else
                        /* No timeouts, so wait forever */