1 files changed, 4 insertions, 4 deletions

diff --git a/opentracker.c b/opentracker.c
index 6271b9e..065a1ea 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -40,7 +40,7 @@
 
 /* Globals */
 uint32_t            g_tracker_id;
-volatile int        g_opentracker_running = 1;
+_Atomic int         g_opentracker_running = 1;
 int                 g_self_pipe[2];
 
 
@@ -297,12 +297,12 @@ static void *server_mainloop(void *args) {
     while ((sock = mutex_workqueue_popresult(&iovec_entries, &iovector, &is_partial)) != -1)
       http_sendiovecdata(sock, &ws, iovec_entries, iovector, is_partial);
 
-    if (g_now_seconds > next_timeout_check) {
+    if (time_now_seconds() > next_timeout_check) {
       int cursor = 0;
 
-      while ((sock = fdstate_next_expired(g_now_seconds, &cursor)) != -1)
+      while ((sock = fdstate_next_expired(time_now_seconds(), &cursor)) != -1)
         handle_dead(sock);
-      next_timeout_check = g_now_seconds + OT_CLIENT_TIMEOUT_CHECKINTERVAL;
+      next_timeout_check = time_future_seconds(OT_CLIENT_TIMEOUT_CHECKINTERVAL);
     }
 
     livesync_ticker();