41 files changed, 285 insertions, 181 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3266e2f..9fe1c3c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,6 +171,8 @@ set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium)
 set(toxcore_SOURCES ${toxcore_SOURCES}
   toxcore/logger.c
   toxcore/logger.h
+  toxcore/mono_time.c
+  toxcore/mono_time.h
   toxcore/network.c
   toxcore/network.h
   toxcore/state.c
@@ -343,6 +345,7 @@ include(CompileGTest)
 unit_test(toxav ring_buffer)
 unit_test(toxav rtp)
 unit_test(toxcore crypto_core)
+unit_test(toxcore mono_time)
 unit_test(toxcore util)
 
 ################################################################################
diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 134bdf9b..f5bc2471 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -18,6 +18,7 @@
 #include "../toxcore/TCP_server.h"
 
 #include "../toxcore/crypto_core.h"
+#include "../toxcore/mono_time.h"
 #include "../toxcore/util.h"
 
 #include "helpers.h"
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index a4f20cba..45679205 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -14,6 +14,7 @@
 #include <sys/types.h>
 #include <time.h>
 
+#include "../toxcore/mono_time.h"
 #include "../toxcore/onion.h"
 #include "../toxcore/onion_announce.h"
 #include "../toxcore/onion_client.h"
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index e89a6823..94183421 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -176,6 +176,8 @@ static void *call_thread(void *pd)
 
     printf("Closing thread\n");
     pthread_exit(nullptr);
+
+    return nullptr;
 }
 
 static void test_av_three_calls(void)
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index f263b471..b71ab0b1 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -33,6 +33,7 @@
 #include "../toxcore/LAN_discovery.h"
 #include "../toxcore/friend_requests.h"
 #include "../toxcore/logger.h"
+#include "../toxcore/mono_time.h"
 #include "../toxcore/tox.h"
 #include "../toxcore/util.h"
 
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index 3c6d5d2c..fd05f8a2 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -38,6 +38,7 @@
 #include "../../../toxcore/LAN_discovery.h"
 #include "../../../toxcore/TCP_server.h"
 #include "../../../toxcore/logger.h"
+#include "../../../toxcore/mono_time.h"
 #include "../../../toxcore/onion_announce.h"
 #include "../../../toxcore/util.h"
 
diff --git a/other/monolith.h b/other/monolith.h
index 426ba0d9..356252f2 100644
--- a/other/monolith.h
+++ b/other/monolith.h
@@ -13,6 +13,7 @@
 #include "../toxcore/group.c"
 #include "../toxcore/list.c"
 #include "../toxcore/logger.c"
+#include "../toxcore/mono_time.c"
 #include "../toxcore/network.c"
 #include "../toxcore/net_crypto.c"
 #include "../toxcore/onion.c"
diff --git a/other/travis/env-freebsd.sh b/other/travis/env-freebsd.sh
index f9aa0cbf..882e9da5 100644
--- a/other/travis/env-freebsd.sh
+++ b/other/travis/env-freebsd.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 
 CMAKE=cmake
-# Asan is disabled because it's currently broken in FreeBSD 11.
-# We should try enabling it in the next FreeBSD release and see if it works.
-CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DASAN=OFF"
 NPROC=`nproc`
 CURDIR=/root
 RUN_TESTS=true
diff --git a/other/travis/env.sh b/other/travis/env.sh
index 7d90d395..2d3e646c 100644
--- a/other/travis/env.sh
+++ b/other/travis/env.sh
@@ -8,7 +8,6 @@ export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig
 export ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle
 export CFLAGS="-O3 -DTRAVIS_ENV=1"
 export CXXFLAGS="-O3 -DTRAVIS_ENV=1"
-export CMAKE_EXTRA_FLAGS="-DERROR_ON_WARNING=ON"
 export MAKE=make
 
 BUILD_DIR=_build
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index f82fd978..ae2af416 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -28,14 +28,12 @@ RUN $CMAKE                                      \
   -B$BUILD_DIR                                  \
   -H.                                           \
   -DCMAKE_INSTALL_PREFIX:PATH=$CURDIR/_install  \
-  -DASAN=ON                                     \
   -DDEBUG=ON                                    \
   -DMUST_BUILD_TOXAV=ON                         \
   -DSTRICT_ABI=ON                               \
   -DTEST_TIMEOUT_SECONDS=120                    \
   -DTRACE=ON                                    \
-  -DUSE_IPV6=$USE_IPV6                          \
-  $CMAKE_EXTRA_FLAGS
+  -DUSE_IPV6=$USE_IPV6
 
 export CTEST_OUTPUT_ON_FAILURE=1
 
diff --git a/testing/av_test.c b/testing/av_test.c
index 5cc3b5dd..87a01871 100644
--- a/testing/av_test.c
+++ b/testing/av_test.c
@@ -45,7 +45,7 @@ extern "C" {
 #include "../toxav/ring_buffer.c"
 
 #include "../toxav/toxav.h"
-#include "../toxcore/network.h" /* current_time_monotonic() */
+#include "../toxcore/mono_time.h" /* current_time_monotonic() */
 #include "../toxcore/tox.h"
 #include "../toxcore/util.h"
 
diff --git a/toxav/audio.c b/toxav/audio.c
index 75d3d477..6889ef09 100644
--- a/toxav/audio.c
+++ b/toxav/audio.c
@@ -29,6 +29,7 @@
 #include "rtp.h"
 
 #include "../toxcore/logger.h"
+#include "../toxcore/mono_time.h"
 
 static struct JitterBuffer *jbuf_new(uint32_t capacity);
 static void jbuf_clear(struct JitterBuffer *q);
diff --git a/toxav/bwcontroller.c b/toxav/bwcontroller.c
index 2d7dd659..05fac704 100644
--- a/toxav/bwcontroller.c
+++ b/toxav/bwcontroller.c
@@ -31,6 +31,7 @@
 #include "ring_buffer.h"
 
 #include "../toxcore/logger.h"
+#include "../toxcore/mono_time.h"
 #include "../toxcore/util.h"
 
 #define BWC_PACKET_ID 196
diff --git a/toxav/groupav.c b/toxav/groupav.c
index 8936801a..15fdd534 100644
--- a/toxav/groupav.c
+++ b/toxav/groupav.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "../toxcore/logger.h"
+#include "../toxcore/mono_time.h"
 #include "../toxcore/util.h"
 
 #define GROUP_JBUF_SIZE 6
diff --git a/toxav/rtp.c b/toxav/rtp.c
index 1e178720..3d563a1f 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -32,6 +32,7 @@
 
 #include "../toxcore/Messenger.h"
 #include "../toxcore/logger.h"
+#include "../toxcore/mono_time.h"
 #include "../toxcore/util.h"
 
 enum {
diff --git a/toxav/toxav.c b/toxav/toxav.c
index 36bf9cc2..5abe1130 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -28,6 +28,7 @@
 
 #include "../toxcore/Messenger.h"
 #include "../toxcore/logger.h"
+#include "../toxcore/mono_time.h"
 #include "../toxcore/util.h"
 
 #include <assert.h>
diff --git a/toxav/video.c b/toxav/video.c
index 1126b8e6..5145c29c 100644
--- a/toxav/video.c
+++ b/toxav/video.c
@@ -32,6 +32,7 @@
 #include "rtp.h"
 
 #include "../toxcore/logger.h"
+#include "../toxcore/mono_time.h"
 #include "../toxcore/network.h"
 
 /**
diff --git a/toxcore/BUILD.bazel b/toxcore/BUILD.bazel
index 381a1255..543bb59f 100644
--- a/toxcore/BUILD.bazel
+++ b/toxcore/BUILD.bazel
@@ -59,6 +59,22 @@ cc_library(
 )
 
 cc_library(
+    name = "mono_time",
+    srcs = ["mono_time.c"],
+    hdrs = ["mono_time.h"],
+    deps = [":ccompat"],
+)
+
+cc_test(
+    name = "mono_time_test",
+    srcs = ["mono_time_test.cc"],
+    deps = [
+        ":mono_time",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+cc_library(
     name = "network",
     srcs = [
         "network.c",
@@ -77,6 +93,7 @@ cc_library(
         ":ccompat",
         ":crypto_core",
         ":logger",
+        ":mono_time",
     ],
 )
 
diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index fe3c1159..2572b28a 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -29,6 +29,7 @@
 
 #include "LAN_discovery.h"
 #include "logger.h"
+#include "mono_time.h"
 #include "network.h"
 #include "ping.h"
 #include "state.h"
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
index 4a007a66..a68b2a7d 100644
--- a/toxcore/Makefile.inc
+++ b/toxcore/Makefile.inc
@@ -8,6 +8,8 @@ libtoxcore_la_includedir = $(includedir)/tox
 libtoxcore_la_SOURCES = ../toxcore/ccompat.h \
                         ../toxcore/DHT.h \
                         ../toxcore/DHT.c \
+                        ../toxcore/mono_time.h \
+                        ../toxcore/mono_time.c \
                         ../toxcore/network.h \
                         ../toxcore/network.c \
                         ../toxcore/crypto_core.h \
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 404827c6..a5d15a34 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -34,6 +34,7 @@
 #include <time.h>
 
 #include "logger.h"
+#include "mono_time.h"
 #include "network.h"
 #include "state.h"
 #include "util.h"
@@ -1764,8 +1765,8 @@ static int handle_filecontrol(Messenger *m, int32_t friendnumber, uint8_t receiv
 
             if (position >= ft->size) {
                 LOGGER_DEBUG(m->log,
-                             "file control (friend %d, file %d): seek position %lld exceeds file size %lld",
-                             friendnumber, filenumber, (unsigned long long)position, (unsigned long long)ft->size);
+                             "file control (friend %d, file %d): seek position %ld exceeds file size %ld",
+                             friendnumber, filenumber, (unsigned long)position, (unsigned long)ft->size);
                 return -1;
             }
 
diff --git a/toxcore/TCP_client.c b/toxcore/TCP_client.c
index d1cd4d66..1291d276 100644
--- a/toxcore/TCP_client.c
+++ b/toxcore/TCP_client.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mono_time.h"
 #include "util.h"
 
 struct TCP_Client_Connection {
diff --git a/toxcore/TCP_connection.c b/toxcore/TCP_connection.c
index 06cb6e34..cd1fb565 100644
--- a/toxcore/TCP_connection.c
+++ b/toxcore/TCP_connection.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mono_time.h"
 #include "util.h"
 
 
diff --git a/toxcore/TCP_server.c b/toxcore/TCP_server.c
index b31fab72..032b07b3 100644
--- a/toxcore/TCP_server.c
+++ b/toxcore/TCP_server.c
@@ -39,6 +39,7 @@
 #include <unistd.h>
 #endif
 
+#include "mono_time.h"
 #include "util.h"
 
 typedef struct TCP_Secure_Connection {
diff --git a/toxcore/friend_connection.c b/toxcore/friend_connection.c
index 64a04773..4d245871 100644
--- a/toxcore/friend_connection.c
+++ b/toxcore/friend_connection.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mono_time.h"
 #include "util.h"
 
 #define PORTS_PER_DISCOVERY 10
diff --git a/toxcore/group.c b/toxcore/group.c
index b7042f2f..4942d872 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mono_time.h"
 #include "util.h"
 
 /* return 1 if the groupnumber is not valid.
diff --git a/toxcore/mono_time.c b/toxcore/mono_time.c
new file mode 100644
index 00000000..6f54731b
--- /dev/null
+++ b/toxcore/mono_time.c
@@ -0,0 +1,157 @@
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
+#endif
+
+#if !defined(OS_WIN32) && (defined(_WIN32) || defined(__WIN32__) || defined(WIN32))
+#define OS_WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
+#ifdef __APPLE__
+#include <mach/clock.h>
+#include <mach/mach.h>
+#endif
+
+#ifndef OS_WIN32
+#include <sys/time.h>
+#endif
+
+#include "mono_time.h"
+
+#include <stdlib.h>
+#include <time.h>
+
+#include "ccompat.h"
+
+/* don't call into system billions of times for no reason */
+struct Mono_Time {
+    uint64_t time;
+    uint64_t base_time;
+};
+
+Mono_Time *mono_time_new(void)
+{
+    Mono_Time *monotime = (Mono_Time *)malloc(sizeof(Mono_Time));
+
+    if (monotime == nullptr) {
+        return nullptr;
+    }
+
+    monotime->time = 0;
+    monotime->base_time = 0;
+
+    return monotime;
+}
+
+void mono_time_free(Mono_Time *monotime)
+{
+    free(monotime);
+}
+
+void mono_time_update(Mono_Time *monotime)
+{
+    if (monotime->base_time == 0) {
+        monotime->base_time = ((uint64_t)time(nullptr) - (current_time_monotonic() / 1000ULL));
+    }
+
+    monotime->time = (current_time_monotonic() / 1000ULL) + monotime->base_time;
+}
+
+uint64_t mono_time_get(const Mono_Time *monotime)
+{
+    return monotime->time;
+}
+
+bool mono_time_is_timeout(const Mono_Time *monotime, uint64_t timestamp, uint64_t timeout)
+{
+    return timestamp + timeout <= mono_time_get(monotime);
+}
+
+
+static Mono_Time global_time;
+
+/* XXX: note that this is not thread-safe; if multiple threads call unix_time_update() concurrently, the return value of
+ * unix_time() may fail to increase monotonically with increasing time */
+void unix_time_update(void)
+{
+    mono_time_update(&global_time);
+}
+uint64_t unix_time(void)
+{
+    return mono_time_get(&global_time);
+}
+int is_timeout(uint64_t timestamp, uint64_t timeout)
+{
+    return mono_time_is_timeout(&global_time, timestamp, timeout);
+}
+
+
+
+/* return current UNIX time in microseconds (us). */
+uint64_t current_time_actual(void)
+{
+    uint64_t time;
+#ifdef OS_WIN32
+    /* This probably works fine */
+    FILETIME ft;
+    GetSystemTimeAsFileTime(&ft);
+    time = ft.dwHighDateTime;
+    time <<= 32;
+    time |= ft.dwLowDateTime;
+    time -= 116444736000000000ULL;
+    return time / 10;
+#else
+    struct timeval a;
+    gettimeofday(&a, nullptr);
+    time = 1000000ULL * a.tv_sec + a.tv_usec;
+    return time;
+#endif
+}
+
+
+#ifdef OS_WIN32
+static uint64_t last_monotime;
+static uint64_t add_monotime;
+#endif
+
+/* return current monotonic time in milliseconds (ms). */
+uint64_t current_time_monotonic(void)
+{
+    uint64_t time;
+#ifdef OS_WIN32
+    uint64_t old_add_monotime = add_monotime;
+    time = (uint64_t)GetTickCount() + add_monotime;
+
+    /* Check if time has decreased because of 32 bit wrap from GetTickCount(), while avoiding false positives from race
+     * conditions when multiple threads call this function at once */
+    if (time + 0x10000 < last_monotime) {
+        uint32_t add = ~0;
+        /* use old_add_monotime rather than simply incrementing add_monotime, to handle the case that many threads
+         * simultaneously detect an overflow */
+        add_monotime = old_add_monotime + add;
+        time += add;
+    }
+
+    last_monotime = time;
+#else
+    struct timespec monotime;
+#if defined(__linux__) && defined(CLOCK_MONOTONIC_RAW)
+    clock_gettime(CLOCK_MONOTONIC_RAW, &monotime);
+#elif defined(__APPLE__)
+    clock_serv_t muhclock;
+    mach_timespec_t machtime;
+
+    host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &muhclock);
+    clock_get_time(muhclock, &machtime);
+    mach_port_deallocate(mach_task_self(), muhclock);
+
+    monotime.tv_sec = machtime.tv_sec;
+    monotime.tv_nsec = machtime.tv_nsec;
+#else
+    clock_gettime(CLOCK_MONOTONIC, &monotime);
+#endif
+    time = 1000ULL * monotime.tv_sec + (monotime.tv_nsec / 1000000ULL);
+#endif
+    return time;
+}
diff --git a/toxcore/mono_time.h b/toxcore/mono_time.h
new file mode 100644
index 00000000..63e0f49d
--- /dev/null
+++ b/toxcore/mono_time.h
@@ -0,0 +1,35 @@
+#ifndef C_TOXCORE_TOXCORE_MONO_TIME_H
+#define C_TOXCORE_TOXCORE_MONO_TIME_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct Mono_Time Mono_Time;
+
+Mono_Time *mono_time_new(void);
+void mono_time_free(Mono_Time *monotime);
+
+void mono_time_update(Mono_Time *monotime);
+uint64_t mono_time_get(const Mono_Time *monotime);
+bool mono_time_is_timeout(const Mono_Time *monotime, uint64_t timestamp, uint64_t timeout);
+
+// TODO(#405): Use per-tox monotime, delete these functions.
+void unix_time_update(void);
+uint64_t unix_time(void);
+int is_timeout(uint64_t timestamp, uint64_t timeout);
+
+/* return current UNIX time in microseconds (us). */
+uint64_t current_time_actual(void);
+
+/* return current monotonic time in milliseconds (ms). */
+uint64_t current_time_monotonic(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // C_TOXCORE_TOXCORE_MONO_TIME_H
diff --git a/toxcore/mono_time_test.cc b/toxcore/mono_time_test.cc
new file mode 100644
index 00000000..5ad91322
--- /dev/null
+++ b/toxcore/mono_time_test.cc
@@ -0,0 +1,30 @@
+#include "mono_time.h"
+
+#include <gtest/gtest.h>
+
+namespace {
+
+TEST(Util, UnixTimeIncreasesOverTime) {
+  unix_time_update();
+  uint64_t const start = unix_time();
+
+  while (start == unix_time()) {
+    unix_time_update();
+  }
+
+  uint64_t const end = unix_time();
+  EXPECT_GT(end, start);
+}
+
+TEST(Util, IsTimeout) {
+  uint64_t const start = unix_time();
+  EXPECT_FALSE(is_timeout(start, 1));
+
+  while (start == unix_time()) {
+    unix_time_update();
+  }
+
+  EXPECT_TRUE(is_timeout(start, 1));
+}
+
+}  // namespace
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index f4c6335b..b9ffaf21 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mono_time.h"
 #include "util.h"
 
 typedef struct Packet_Data {
diff --git a/toxcore/network.c b/toxcore/network.c
index 2a32a170..24e53c47 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -170,6 +170,7 @@ static int inet_pton(int family, const char *addrString, void *addrbuf)
 #include <string.h>
 
 #include "logger.h"
+#include "mono_time.h"
 #include "util.h"
 
 // Disable MSG_NOSIGNAL on systems not supporting it, e.g. Windows, FreeBSD
@@ -418,74 +419,6 @@ int set_socket_dualstack(Socket sock)
 }
 
 
-/*  return current UNIX time in microseconds (us). */
-static uint64_t current_time_actual(void)
-{
-    uint64_t time;
-#ifdef OS_WIN32
-    /* This probably works fine */
-    FILETIME ft;
-    GetSystemTimeAsFileTime(&ft);
-    time = ft.dwHighDateTime;
-    time <<= 32;
-    time |= ft.dwLowDateTime;
-    time -= 116444736000000000ULL;
-    return time / 10;
-#else
-    struct timeval a;
-    gettimeofday(&a, nullptr);
-    time = 1000000ULL * a.tv_sec + a.tv_usec;
-    return time;
-#endif
-}
-
-
-#ifdef OS_WIN32
-static uint64_t last_monotime;
-static uint64_t add_monotime;
-#endif
-
-/* return current monotonic time in milliseconds (ms). */
-uint64_t current_time_monotonic(void)
-{
-    uint64_t time;
-#ifdef OS_WIN32
-    uint64_t old_add_monotime = add_monotime;
-    time = (uint64_t)GetTickCount() + add_monotime;
-
-    /* Check if time has decreased because of 32 bit wrap from GetTickCount(), while avoiding false positives from race
-     * conditions when multiple threads call this function at once */
-    if (time + 0x10000 < last_monotime) {
-        uint32_t add = ~0;
-        /* use old_add_monotime rather than simply incrementing add_monotime, to handle the case that many threads
-         * simultaneously detect an overflow */
-        add_monotime = old_add_monotime + add;
-        time += add;
-    }
-
-    last_monotime = time;
-#else
-    struct timespec monotime;
-#if defined(__linux__) && defined(CLOCK_MONOTONIC_RAW)
-    clock_gettime(CLOCK_MONOTONIC_RAW, &monotime);
-#elif defined(__APPLE__)
-    clock_serv_t muhclock;
-    mach_timespec_t machtime;
-
-    host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &muhclock);
-    clock_get_time(muhclock, &machtime);
-    mach_port_deallocate(mach_task_self(), muhclock);
-
-    monotime.tv_sec = machtime.tv_sec;
-    monotime.tv_nsec = machtime.tv_nsec;
-#else
-    clock_gettime(CLOCK_MONOTONIC, &monotime);
-#endif
-    time = 1000ULL * monotime.tv_sec + (monotime.tv_nsec / 1000000ULL);
-#endif
-    return time;
-}
-
 static uint32_t data_0(uint16_t buflen, const uint8_t *buffer)
 {
     return buflen > 4 ? net_ntohl(*(const uint32_t *)&buffer[1]) : 0;
diff --git a/toxcore/network.h b/toxcore/network.h
index fbd12bb7..8f166c67 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -381,9 +381,6 @@ int set_socket_reuseaddr(Socket sock);
  */
 int set_socket_dualstack(Socket sock);
 
-/* return current monotonic time in milliseconds (ms). */
-uint64_t current_time_monotonic(void);
-
 /* Basic network functions: */
 
 /* Function to send packet(data) of length length to ip_port. */
diff --git a/toxcore/onion.c b/toxcore/onion.c
index cfe12a05..5ba716fd 100644
--- a/toxcore/onion.c
+++ b/toxcore/onion.c
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mono_time.h"
 #include "util.h"
 
 #define RETURN_1 ONION_RETURN_1
diff --git a/toxcore/onion_announce.c b/toxcore/onion_announce.c
index 8f122fe6..d368face 100644
--- a/toxcore/onion_announce.c
+++ b/toxcore/onion_announce.c
@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include "LAN_discovery.h"
+#include "mono_time.h"
 #include "util.h"
 
 #define PING_ID_TIMEOUT ONION_ANNOUNCE_TIMEOUT
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 483d6409..9c59343d 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -32,6 +32,7 @@
 #include <string.h>
 
 #include "LAN_discovery.h"
+#include "mono_time.h"
 #include "util.h"
 
 /* defines for the array size and
diff --git a/toxcore/ping.c b/toxcore/ping.c
index 3767805d..1bf096bf 100644
--- a/toxcore/ping.c
+++ b/toxcore/ping.c
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include "DHT.h"
+#include "mono_time.h"
 #include "network.h"
 #include "ping_array.h"
 #include "util.h"
diff --git a/toxcore/ping_array.c b/toxcore/ping_array.c
index ded3ed3a..142640dd 100644
--- a/toxcore/ping_array.c
+++ b/toxcore/ping_array.c
@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include "crypto_core.h"
+#include "mono_time.h"
 #include "util.h"
 
 
diff --git a/toxcore/tox.c b/toxcore/tox.c
index c121eb2e..4c764aeb 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -518,6 +518,11 @@ static void set_friend_error(int32_t ret, Tox_Err_Friend_Add *error)
         case FAERR_NOMEM:
             SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_ADD_MALLOC);
             break;
+
+        default:
+            /* can't happen */
+            assert(!"impossible: unknown friend-add error");
+            break;
     }
 }
 
@@ -826,7 +831,9 @@ static void set_message_error(int ret, Tox_Err_Friend_Send_Message *error)
             break;
 
         case -5:
+        default:
             /* can't happen */
+            assert(!"impossible: unknown send-message error");
             break;
     }
 }
diff --git a/toxcore/util.c b/toxcore/util.c
index 0bc77c05..5ab092ce 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -34,75 +34,12 @@
 #include "util.h"
 
 #include "crypto_core.h" /* for CRYPTO_PUBLIC_KEY_SIZE */
-#include "network.h" /* for current_time_monotonic */
 
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 
-/* don't call into system billions of times for no reason */
-struct Unix_Time {
-    uint64_t time;
-    uint64_t base_time;
-};
-
-Unix_Time *unix_time_new(void)
-{
-    Unix_Time *unixtime = (Unix_Time *)malloc(sizeof(Unix_Time));
-
-    if (unixtime == nullptr) {
-        return nullptr;
-    }
-
-    unixtime->time = 0;
-    unixtime->base_time = 0;
-
-    return unixtime;
-}
-
-void unix_time_free(Unix_Time *unixtime)
-{
-    free(unixtime);
-}
-
-void unix_time_update_r(Unix_Time *unixtime)
-{
-    if (unixtime->base_time == 0) {
-        unixtime->base_time = ((uint64_t)time(nullptr) - (current_time_monotonic() / 1000ULL));
-    }
-
-    unixtime->time = (current_time_monotonic() / 1000ULL) + unixtime->base_time;
-}
-
-uint64_t unix_time_get(const Unix_Time *unixtime)
-{
-    return unixtime->time;
-}
-
-int unix_time_is_timeout(const Unix_Time *unixtime, uint64_t timestamp, uint64_t timeout)
-{
-    return timestamp + timeout <= unix_time_get(unixtime);
-}
-
-static Unix_Time global_time;
-
-/* XXX: note that this is not thread-safe; if multiple threads call unix_time_update() concurrently, the return value of
- * unix_time() may fail to increase monotonically with increasing time */
-void unix_time_update(void)
-{
-    unix_time_update_r(&global_time);
-}
-uint64_t unix_time(void)
-{
-    return unix_time_get(&global_time);
-}
-int is_timeout(uint64_t timestamp, uint64_t timeout)
-{
-    return unix_time_is_timeout(&global_time, timestamp, timeout);
-}
-
-
 /* id functions */
 bool id_equal(const uint8_t *dest, const uint8_t *src)
 {
diff --git a/toxcore/util.h b/toxcore/util.h
index de493ebe..4c5023cf 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -39,21 +39,6 @@ extern "C" {
 #define MIN(a,b) (((a)<(b))?(a):(b))
 #define PAIR(TYPE1__, TYPE2__) struct { TYPE1__ first; TYPE2__ second; }
 
-typedef struct Unix_Time Unix_Time;
-
-Unix_Time *unix_time_new(void);
-void unix_time_free(Unix_Time *unixtime);
-
-// TODO(#405): Use per-tox unixtime, remove unix_time_update, and rename
-// unix_time_update_r to unix_time_update.
-void unix_time_update_r(Unix_Time *unixtime);
-uint64_t unix_time_get(const Unix_Time *unixtime);
-int unix_time_is_timeout(const Unix_Time *unixtime, uint64_t timestamp, uint64_t timeout);
-
-void unix_time_update(void);
-uint64_t unix_time(void);
-int is_timeout(uint64_t timestamp, uint64_t timeout);
-
 /* id functions */
 bool id_equal(const uint8_t *dest, const uint8_t *src);
 uint32_t id_copy(uint8_t *dest, const uint8_t *src); /* return value is CLIENT_ID_SIZE */
diff --git a/toxcore/util_test.cc b/toxcore/util_test.cc
index 541aa61f..ff57f3fb 100644
--- a/toxcore/util_test.cc
+++ b/toxcore/util_test.cc
@@ -4,28 +4,7 @@
 
 #include <gtest/gtest.h>
 
-TEST(Util, UnixTimeIncreasesOverTime) {
-  unix_time_update();
-  uint64_t const start = unix_time();
-
-  while (start == unix_time()) {
-    unix_time_update();
-  }
-
-  uint64_t const end = unix_time();
-  EXPECT_GT(end, start);
-}
-
-TEST(Util, IsTimeout) {
-  uint64_t const start = unix_time();
-  EXPECT_FALSE(is_timeout(start, 1));
-
-  while (start == unix_time()) {
-    unix_time_update();
-  }
-
-  EXPECT_TRUE(is_timeout(start, 1));
-}
+namespace {
 
 TEST(Util, TwoRandomIdsAreNotEqual) {
   uint8_t pk1[CRYPTO_PUBLIC_KEY_SIZE];
@@ -49,3 +28,5 @@ TEST(Util, IdCopyMakesKeysEqual) {
 
   EXPECT_TRUE(id_equal(pk1, pk2));
 }
+
+}  // namespace