Avoid implementations in .h files or #including .c files.

Also, avoid the need for putting `_XOPEN_SOURCE` in every test file.

7 files changed, 148 insertions, 44 deletions

diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
index 117eb69d..4d0674b4 100644
--- a/testing/BUILD.bazel
+++ b/testing/BUILD.bazel
@@ -2,11 +2,10 @@ load("//tools:no_undefined.bzl", "cc_library")
 
 cc_library(
     name = "misc_tools",
-    hdrs = [
-        "misc_tools.c",
-    ],
+    srcs = ["misc_tools.c"],
+    hdrs = ["misc_tools.h"],
     visibility = ["//c-toxcore:__subpackages__"],
-    deps = ["//c-toxcore/toxcore:ccompat"],
+    deps = ["//c-toxcore/toxcore"],
 )
 
 cc_binary(
@@ -53,3 +52,13 @@ cc_binary(
         "//c-toxcore/toxcore",
     ],
 )
+
+cc_library(
+    name = "monolith",
+    hdrs = [
+        "misc_tools.c",
+        "misc_tools.h",
+    ],
+    visibility = ["//c-toxcore/other:__pkg__"],
+    deps = ["//c-toxcore/toxcore"],
+)
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 336e7e18..c242953a 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -30,21 +30,18 @@
  */
 #define _XOPEN_SOURCE 600
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-//#include "../core/network.h"
-#include "../toxcore/DHT.h"
-#include "../toxcore/friend_requests.h"
-#include "misc_tools.c"
-
+#include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
 #if !defined(_WIN32) && !defined(__WIN32__) && !defined (WIN32)
 #include <arpa/inet.h>
 #endif
 
+#include "../toxcore/DHT.h"
+#include "../toxcore/friend_requests.h"
+#include "misc_tools.h"
+
 #define PORT 33445
 
 static uint8_t zeroes_cid[CRYPTO_PUBLIC_KEY_SIZE];
diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index f4ed568c..fa1c1029 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -1,3 +1,13 @@
+if BUILD_TESTS
+TEST_LIB = misc_tools
+endif
+if BUILD_TESTING
+TEST_LIB = misc_tools
+endif
+
+noinst_LTLIBRARIES += libmisc_tools.la
+libmisc_tools_la_SOURCES = ../testing/misc_tools.c ../testing/misc_tools.h
+
 if BUILD_TESTING
 
 noinst_PROGRAMS +=      DHT_test \
@@ -10,6 +20,7 @@ DHT_test_CFLAGS =       $(LIBSODIUM_CFLAGS) \
 
 DHT_test_LDADD =        $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
+                        libmisc_tools.la \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
                         $(NACL_OBJECTS) \
@@ -25,13 +36,11 @@ Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS) \
 
 Messenger_test_LDADD =  $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
+                        libmisc_tools.la \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
                         $(NACL_OBJECTS) \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
-
-EXTRA_DIST +=                   $(top_srcdir)/testing/misc_tools.c
-
 endif
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index 7885779b..a3380a09 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -38,20 +38,17 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#define _XOPEN_SOURCE 600
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "../toxcore/Messenger.h"
-#include "misc_tools.c"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #if !defined(_WIN32) && !defined(__WIN32__) && !defined (WIN32)
 #include <arpa/inet.h>
-
 #endif
 
+#include "../toxcore/Messenger.h"
+#include "misc_tools.h"
+
 static void print_message(Messenger *m, uint32_t friendnumber, unsigned int type, const uint8_t *string, size_t length,
                           void *userdata)
 {
diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index 9b0d9956..8683830d 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -21,35 +21,40 @@
  * You should have received a copy of the GNU General Public License
  * along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef MISC_TOOLS_C
-#define MISC_TOOLS_C
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#ifndef _POSIX_C_SOURCE
+// For nanosleep().
+#define _POSIX_C_SOURCE 199309L
 #endif
 
+#include "misc_tools.h"
+
+#include <assert.h>
 #include <ctype.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-//Sleep function (x = milliseconds)
-#ifndef c_sleep
-#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
 #include <windows.h>
-#define c_sleep(x) Sleep(x)
 #else
-#include <unistd.h>
-#define c_sleep(x) usleep(1000*(x))
-#endif
+#include <time.h>
 #endif
 
 #include "../toxcore/ccompat.h"
+#include "../toxcore/tox.h"
 
-uint8_t *hex_string_to_bin(const char *hex_string);
-int tox_strncasecmp(const char *s1, const char *s2, size_t n);
-int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled);
+void c_sleep(uint32_t x)
+{
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+    Sleep(x);
+#else
+    struct timespec req;
+    req.tv_sec = x / 1000;
+    req.tv_nsec = (long)x % 1000 * 1000 * 1000;
+    nanosleep(&req, nullptr);
+#endif
+}
 
 // You are responsible for freeing the return value!
 uint8_t *hex_string_to_bin(const char *hex_string)
@@ -123,4 +128,64 @@ int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled)
     return argvoffset;
 }
 
-#endif // MISC_TOOLS_C
+static const char *tox_log_level_name(TOX_LOG_LEVEL level)
+{
+    switch (level) {
+        case TOX_LOG_LEVEL_TRACE:
+            return "TRACE";
+
+        case TOX_LOG_LEVEL_DEBUG:
+            return "DEBUG";
+
+        case TOX_LOG_LEVEL_INFO:
+            return "INFO";
+
+        case TOX_LOG_LEVEL_WARNING:
+            return "WARNING";
+
+        case TOX_LOG_LEVEL_ERROR:
+            return "ERROR";
+    }
+
+    return "<unknown>";
+}
+
+void print_debug_log(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t line, const char *func,
+                     const char *message, void *user_data)
+{
+    if (level == TOX_LOG_LEVEL_TRACE) {
+        return;
+    }
+
+    uint32_t index = user_data ? *(uint32_t *)user_data : 0;
+    fprintf(stderr, "[#%u] %s %s:%u\t%s:\t%s\n", index, tox_log_level_name(level), file, line, func, message);
+}
+
+Tox *tox_new_log_lan(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_user_data, bool lan_discovery)
+{
+    struct Tox_Options *log_options = options;
+
+    if (log_options == nullptr) {
+        log_options = tox_options_new(nullptr);
+    }
+
+    assert(log_options != nullptr);
+
+    tox_options_set_local_discovery_enabled(log_options, lan_discovery);
+    tox_options_set_start_port(log_options, 33445);
+    tox_options_set_end_port(log_options, 33445 + 2000);
+    tox_options_set_log_callback(log_options, &print_debug_log);
+    tox_options_set_log_user_data(log_options, log_user_data);
+    Tox *tox = tox_new(log_options, err);
+
+    if (options == nullptr) {
+        tox_options_free(log_options);
+    }
+
+    return tox;
+}
+
+Tox *tox_new_log(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_user_data)
+{
+    return tox_new_log_lan(options, err, log_user_data, false);
+}
diff --git a/testing/misc_tools.h b/testing/misc_tools.h
new file mode 100644
index 00000000..deaa177d
--- /dev/null
+++ b/testing/misc_tools.h
@@ -0,0 +1,29 @@
+#ifndef C_TOXCORE_TESTING_MISC_TOOLS_H
+#define C_TOXCORE_TESTING_MISC_TOOLS_H
+
+#include "../toxcore/tox.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Amount of time in milliseconds to wait between tox_iterate calls.
+#define ITERATION_INTERVAL 200
+
+void c_sleep(uint32_t x);
+
+uint8_t *hex_string_to_bin(const char *hex_string);
+int tox_strncasecmp(const char *s1, const char *s2, size_t n);
+int cmdline_parsefor_ipv46(int argc, char **argv, uint8_t *ipv6enabled);
+
+void print_debug_log(Tox *m, TOX_LOG_LEVEL level, const char *file, uint32_t line, const char *func,
+                     const char *message, void *user_data);
+
+Tox *tox_new_log(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_user_data);
+Tox *tox_new_log_lan(struct Tox_Options *options, TOX_ERR_NEW *err, void *log_user_data, bool lan_discovery);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/testing/random_testing.cc b/testing/random_testing.cc
index f4175675..bcdb8e70 100644
--- a/testing/random_testing.cc
+++ b/testing/random_testing.cc
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "../toxcore/tox.h"
-#include "misc_tools.c"
+#include "misc_tools.h"
 
 namespace {
 
@@ -32,8 +32,6 @@ constexpr uint32_t MAX_ACTIONS = 10000;
 constexpr uint32_t MAX_ACTION_ATTEMPTS = 100;
 // Number of tox_iterate calls between each action.
 constexpr uint32_t ITERATIONS_PER_ACTION = 1;
-// Amount of time in milliseconds to wait between tox_iterate calls.
-constexpr uint32_t ITERATION_INTERVAL = 5;
 
 struct Tox_Options_Deleter {
   void operator()(Tox_Options *options) const { tox_options_free(options); }