1 files changed, 81 insertions, 16 deletions

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);
+}