15 files changed, 138 insertions, 211 deletions

diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 9e07135c..e3cdc838 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -9,7 +9,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testclient.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Lossless_UDP_testserver.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Messenger_test.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/crypto_speed_test.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/timer_test.cmake)
 
 if(WIN32)
 #       include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 3883f3a7..8ab9157e 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -28,8 +28,8 @@
  */
 
 //#include "../core/network.h"
-#include "../core/DHT.c"
-#include "../core/friend_requests.c"
+#include "../core/DHT.h"
+#include "../core/friend_requests.h"
 #include "misc_tools.h"
 
 #include <string.h>
@@ -48,7 +48,7 @@
 
 #define PORT 33445
 
-void print_clientlist()
+void print_clientlist(DHT *dht)
 {
     uint32_t i, j;
     IP_Port p_ip;
@@ -58,34 +58,34 @@ void print_clientlist()
         printf("ClientID: ");
 
         for (j = 0; j < 32; j++) {
-            printf("%02hhX", close_clientlist[i].client_id[j]);
+            printf("%02hhX", dht->close_clientlist[i].client_id[j]);
         }
 
-        p_ip = close_clientlist[i].ip_port;
+        p_ip = dht->close_clientlist[i].ip_port;
         printf("\nIP: %u.%u.%u.%u Port: %u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
-        printf("\nTimestamp: %llu", (long long unsigned int) close_clientlist[i].timestamp);
-        printf("\nLast pinged: %llu\n", (long long unsigned int) close_clientlist[i].last_pinged);
-        p_ip = close_clientlist[i].ret_ip_port;
+        printf("\nTimestamp: %llu", (long long unsigned int) dht->close_clientlist[i].timestamp);
+        printf("\nLast pinged: %llu\n", (long long unsigned int) dht->close_clientlist[i].last_pinged);
+        p_ip = dht->close_clientlist[i].ret_ip_port;
         printf("OUR IP: %u.%u.%u.%u Port: %u\n", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
-        printf("Timestamp: %llu\n", (long long unsigned int) close_clientlist[i].ret_timestamp);
+        printf("Timestamp: %llu\n", (long long unsigned int) dht->close_clientlist[i].ret_timestamp);
     }
 }
 
-void print_friendlist()
+void print_friendlist(DHT *dht)
 {
     uint32_t i, j, k;
     IP_Port p_ip;
     printf("_________________FRIENDS__________________________________\n");
 
-    for (k = 0; k < num_friends; k++) {
+    for (k = 0; k < dht->num_friends; k++) {
         printf("FRIEND %u\n", k);
         printf("ID: ");
 
         for (j = 0; j < 32; j++) {
-            printf("%c", friends_list[k].client_id[j]);
+            printf("%c", dht->friends_list[k].client_id[j]);
         }
 
-        p_ip = DHT_getfriendip(friends_list[k].client_id);
+        p_ip = DHT_getfriendip(dht, dht->friends_list[k].client_id);
         printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
 
         printf("\nCLIENTS IN LIST:\n\n");
@@ -94,19 +94,19 @@ void print_friendlist()
             printf("ClientID: ");
 
             for (j = 0; j < 32; j++) {
-                if (friends_list[k].client_list[i].client_id[j] < 16)
+                if (dht->friends_list[k].client_list[i].client_id[j] < 16)
                     printf("0");
 
-                printf("%hhX", friends_list[k].client_list[i].client_id[j]);
+                printf("%hhX", dht->friends_list[k].client_list[i].client_id[j]);
             }
 
-            p_ip = friends_list[k].client_list[i].ip_port;
+            p_ip = dht->friends_list[k].client_list[i].ip_port;
             printf("\nIP: %u.%u.%u.%u:%u", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
-            printf("\nTimestamp: %llu", (long long unsigned int) friends_list[k].client_list[i].timestamp);
-            printf("\nLast pinged: %llu\n", (long long unsigned int) friends_list[k].client_list[i].last_pinged);
-            p_ip = friends_list[k].client_list[i].ret_ip_port;
+            printf("\nTimestamp: %llu", (long long unsigned int) dht->friends_list[k].client_list[i].timestamp);
+            printf("\nLast pinged: %llu\n", (long long unsigned int) dht->friends_list[k].client_list[i].last_pinged);
+            p_ip = dht->friends_list[k].client_list[i].ret_ip_port;
             printf("ret IP: %u.%u.%u.%u:%u\n", p_ip.ip.c[0], p_ip.ip.c[1], p_ip.ip.c[2], p_ip.ip.c[3], ntohs(p_ip.port));
-            printf("Timestamp: %llu\n", (long long unsigned int)friends_list[k].client_list[i].ret_timestamp);
+            printf("Timestamp: %llu\n", (long long unsigned int)dht->friends_list[k].client_list[i].ret_timestamp);
         }
     }
 }
@@ -130,21 +130,28 @@ void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
 int main(int argc, char *argv[])
 {
     //memcpy(self_client_id, "qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq", 32);
+    /* initialize networking */
+    /* bind to ip 0.0.0.0:PORT */
+    IP ip;
+    ip.i = 0;
+
+    DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT)));
+    init_cryptopackets(dht);
 
     if (argc < 4) {
         printf("usage %s ip port public_key\n", argv[0]);
         exit(0);
     }
 
-    new_keys();
+    new_keys(dht->c);
     printf("OUR ID: ");
     uint32_t i;
 
     for (i = 0; i < 32; i++) {
-        if (self_public_key[i] < 16)
+        if (dht->c->self_public_key[i] < 16)
             printf("0");
 
-        printf("%hhX", self_public_key[i]);
+        printf("%hhX", dht->c->self_public_key[i]);
     }
 
     char temp_id[128];
@@ -153,13 +160,7 @@ int main(int argc, char *argv[])
     if (scanf("%s", temp_id) != 1)
         exit(0);
 
-    DHT_addfriend(hex_string_to_bin(temp_id));
-
-    /* initialize networking */
-    /* bind to ip 0.0.0.0:PORT */
-    IP ip;
-    ip.i = 0;
-    init_networking(ip, PORT);
+    DHT_addfriend(dht, hex_string_to_bin(temp_id));
 
 
     perror("Initialization");
@@ -170,7 +171,7 @@ int main(int argc, char *argv[])
      * bootstrap_ip_port.ip.c[2] = 0;
      * bootstrap_ip_port.ip.c[3] = 1; */
     bootstrap_ip_port.ip.i = inet_addr(argv[1]);
-    DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
+    DHT_bootstrap(dht, bootstrap_ip_port, hex_string_to_bin(argv[3]));
 
     /*
         IP_Port ip_port;
@@ -178,12 +179,9 @@ int main(int argc, char *argv[])
         uint32_t length;
     */
 
-    DHT_init();
-    friendreq_init();
-
     while (1) {
 
-        doDHT();
+        do_DHT(dht);
 
         /* slvrTODO:
                 while(receivepacket(&ip_port, data, &length) != -1) {
@@ -195,13 +193,12 @@ int main(int argc, char *argv[])
                     }
                 }
         */
-        networking_poll();
+        networking_poll(dht->c->lossless_udp->net);
 
-        print_clientlist();
-        print_friendlist();
+        print_clientlist(dht);
+        print_friendlist(dht);
         c_sleep(300);
     }
 
-    shutdown_networking();
     return 0;
 }
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c
index 575be2bd..09e9e0a3 100644
--- a/testing/Lossless_UDP_testclient.c
+++ b/testing/Lossless_UDP_testclient.c
@@ -122,29 +122,29 @@ void printconnection(int connection_id)
 
 /*( receive packets and send them to the packethandler */
 /*run doLossless_UDP(); */
-void Lossless_UDP()
-{
-    /*    IP_Port ip_port;
-        uint8_t data[MAX_UDP_PACKET_SIZE];
-        uint32_t length;
-        while (receivepacket(&ip_port, data, &length) != -1) {
-        printf("packet with length: %u\n", length); */
-    /* if(rand() % 3 != 1)//add packet loss
-     { */
-    /*
-                if (LosslessUDP_handlepacket(data, length, ip_port))
-                    printpacket(data, length, ip_port);
-                else
-                printf("Received handled packet with length: %u\n", length); //printconnection(0); */
-
-    /* } */
-    /* }*/
-
-    networking_poll();
-
-    doLossless_UDP();
+//void Lossless_UDP()
+//{
+/*    IP_Port ip_port;
+    uint8_t data[MAX_UDP_PACKET_SIZE];
+    uint32_t length;
+    while (receivepacket(&ip_port, data, &length) != -1) {
+    printf("packet with length: %u\n", length); */
+/* if(rand() % 3 != 1)//add packet loss
+ { */
+/*
+            if (LosslessUDP_handlepacket(data, length, ip_port))
+                printpacket(data, length, ip_port);
+            else
+            printf("Received handled packet with length: %u\n", length); //printconnection(0); */
 
-}
+/* } */
+/* }*/
+
+//networking_poll();
+
+//doLossless_UDP();
+
+//}
 
 int main(int argc, char *argv[])
 {
@@ -166,25 +166,26 @@ int main(int argc, char *argv[])
     /* bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
-    init_networking(ip, PORT);
+    Lossless_UDP *ludp = new_lossless_udp(new_networking(ip, PORT));
     perror("Initialization");
     IP_Port serverip;
     serverip.ip.i = inet_addr(argv[1]);
     serverip.port = htons(atoi(argv[2]));
     printip(serverip);
-    int connection = new_connection(serverip);
+    int connection = new_connection(ludp, serverip);
     uint64_t timer = current_time();
 
     while (1) {
         /* printconnection(connection); */
-        Lossless_UDP();
+        networking_poll(ludp->net);
+        do_lossless_udp(ludp);
 
-        if (is_connected(connection) == 3) {
+        if (is_connected(ludp, connection) == 3) {
             printf("Connecting took: %llu us\n", (unsigned long long)(current_time() - timer));
             break;
         }
 
-        if (is_connected(connection) == 0) {
+        if (is_connected(ludp, connection) == 0) {
             printf("Connection timeout after: %llu us\n", (unsigned long long)(current_time() - timer));
             return 1;
         }
@@ -194,25 +195,25 @@ int main(int argc, char *argv[])
 
     timer = current_time();
 
-    LosslessUDP_init();
 
     /*read first part of file */
     read = fread(buffer, 1, 512, file);
 
     while (1) {
         /* printconnection(connection); */
-        Lossless_UDP();
+        networking_poll(ludp->net);
+        do_lossless_udp(ludp);
 
-        if (is_connected(connection) == 3) {
+        if (is_connected(ludp, connection) == 3) {
 
-            if (write_packet(connection, buffer, read)) {
+            if (write_packet(ludp, connection, buffer, read)) {
                 /* printf("Wrote data.\n"); */
                 read = fread(buffer, 1, 512, file);
 
             }
 
             /* printf("%u\n", sendqueue(connection)); */
-            if (sendqueue(connection) == 0) {
+            if (sendqueue(ludp, connection) == 0) {
                 if (read == 0) {
                     printf("Sent file successfully in: %llu us\n", (unsigned long long)(current_time() - timer));
                     break;
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c
index dec50d7f..a82b787a 100644
--- a/testing/Lossless_UDP_testserver.c
+++ b/testing/Lossless_UDP_testserver.c
@@ -118,27 +118,27 @@ void printconnection(int connection_id)
 
 /* receive packets and send them to the packethandler
  * run doLossless_UDP(); */
-void Lossless_UDP()
-{
+//void Lossless_UDP()
+//{
 //    IP_Port ip_port;
 //    uint8_t data[MAX_UDP_PACKET_SIZE];
 //    uint32_t length;
 //    while (receivepacket(&ip_port, data, &length) != -1) {
-    //if(rand() % 3 != 1)//add packet loss
-    //{
+//if(rand() % 3 != 1)//add packet loss
+//{
 //            if (LosslessUDP_handlepacket(data, length, ip_port)) {
 //                    printpacket(data, length, ip_port);
 //            } else {
-    //printconnection(0);
+//printconnection(0);
 //                 printf("Received handled packet with length: %u\n", length);
 //            }
-    //}
+//}
 //    }
 
-    networking_poll();
+// networking_poll();
 
-    doLossless_UDP();
-}
+//doLossless_UDP();
+//}
 
 
 int main(int argc, char *argv[])
@@ -161,20 +161,19 @@ int main(int argc, char *argv[])
     //bind to ip 0.0.0.0:PORT
     IP ip;
     ip.i = 0;
-    init_networking(ip, PORT);
+    Lossless_UDP *ludp = new_lossless_udp(new_networking(ip, PORT));
     perror("Initialization");
 
     int connection;
     uint64_t timer = current_time();
 
-    LosslessUDP_init();
-
     while (1) {
-        Lossless_UDP();
-        connection = incoming_connection();
+        networking_poll(ludp->net);
+        do_lossless_udp(ludp);
+        connection = incoming_connection(ludp);
 
         if (connection != -1) {
-            if (is_connected(connection) == 2) {
+            if (is_connected(ludp, connection) == 2) {
                 printf("Received the connection.\n");
 
             }
@@ -189,11 +188,12 @@ int main(int argc, char *argv[])
 
     while (1) {
         //printconnection(0);
-        Lossless_UDP();
+        networking_poll(ludp->net);
+        do_lossless_udp(ludp);
 
-        if (is_connected(connection) >= 2) {
-            kill_connection_in(connection, 3000000);
-            read = read_packet(connection, buffer);
+        if (is_connected(ludp, connection) >= 2) {
+            kill_connection_in(ludp, connection, 3000000);
+            read = read_packet(ludp, connection, buffer);
 
             if (read != 0) {
                 // printf("Received data.\n");
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        if (is_connected(connection) == 4) {
+        if (is_connected(ludp, connection) == 4) {
             printf("Connecting Lost after: %llu us\n", (unsigned long long)(current_time() - timer));
             fclose(file);
             return 1;
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c
index f8685b39..c76584d7 100644
--- a/testing/Messenger_test.c
+++ b/testing/Messenger_test.c
@@ -48,6 +48,7 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 #define c_sleep(x) usleep(1000*x)
+#define PORT 33445
 
 #endif
 
@@ -106,7 +107,7 @@ int main(int argc, char *argv[])
         IP_Port bootstrap_ip_port;
         bootstrap_ip_port.port = htons(atoi(argv[2]));
         bootstrap_ip_port.ip.i = inet_addr(argv[1]);
-        DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
+        DHT_bootstrap(m->dht, bootstrap_ip_port, hex_string_to_bin(argv[3]));
     } else {
         FILE *file = fopen(argv[1], "rb");
 
diff --git a/testing/cmake/timer_test.cmake b/testing/cmake/timer_test.cmake
deleted file mode 100644
index a5f8c5ec..00000000
--- a/testing/cmake/timer_test.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(timer_test C)
-
-set(exe_name timer_test)
-
-add_executable(${exe_name}
-        timer_test.c)
-
-linkCoreLibraries(${exe_name})
diff --git a/testing/nTox.c b/testing/nTox.c
index 8813f305..a476cc19 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -521,12 +521,12 @@ int main(int argc, char *argv[])
         exit(1);
 
     unsigned char *binary_string = hex_string_to_bin(argv[3]);
-    DHT_bootstrap(bootstrap_ip_port, binary_string);
+    DHT_bootstrap(m->dht, bootstrap_ip_port, binary_string);
     free(binary_string);
     nodelay(stdscr, TRUE);
 
     while (true) {
-        if (on == 0 && DHT_isconnected()) {
+        if (on == 0 && DHT_isconnected(m->dht)) {
             new_lines("[i] connected to DHT\n[i] define username with /n");
             on = 1;
         }
diff --git a/testing/timer_test.c b/testing/timer_test.c
deleted file mode 100644
index f47d4878..00000000
--- a/testing/timer_test.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "../core/timer.h"
-#include <stdio.h>
-
-#ifdef WINDOWS
-#include <windows.h>
-#else
-#include <unistd.h>
-#endif
-
-void mssleep(int ms)
-{
-#ifdef WINDOWS
-    Sleep(ms);
-#else
-    usleep(ms * 1000);
-#endif
-}
-
-int callback(timer *t, void *arg)
-{
-    printf("%s\n", (char *)arg);
-    return 1;
-}
-
-int repeating(timer *t, void *arg)
-{
-    printf("%s\n", (char *)arg);
-    timer_start(t, 3);
-    return 0;
-}
-
-extern void timer_debug_print();
-
-int main(int argc, char **argv)
-{
-    timer_init();
-    timer_debug_print();
-
-    timer *t = new_timer();
-    timer_setup(t, &callback, "Long setup method, 4 seconds");
-    timer_start(t, 4);
-    timer_debug_print();
-
-    timer_single(&repeating, (void *)"This repeats every 3 seconds", 3);
-    timer_debug_print();
-
-    timer_single(&callback, "Short method, 4 seconds", 4);
-    timer_debug_print();
-
-    timer_single(&callback, "1 second", 1);
-    timer_debug_print();
-
-    timer_single(&callback, "15 seconds", 15);
-    timer_debug_print();
-
-    timer_single(&callback, "10 seconds", 10);
-    timer_debug_print();
-
-    timer_us(&callback, "100000us", 100000);
-    timer_us(&callback, "13s", 13 * US_PER_SECOND);
-
-    while (true) {
-        timer_poll();
-        mssleep(10);
-    }
-
-    return 0;
-}
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index 57404a59..c7979843 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -123,7 +123,7 @@ static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint1
 
     status[len - 1] = '\0';
     fix_name(status);
-    
+
     wattron(ctx->history, COLOR_PAIR(3));
     wprintw(ctx->history, "* Your partner changed status to '%s'\n", status);
     wattroff(ctx->history, COLOR_PAIR(3));
@@ -342,7 +342,7 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
         wprintw(ctx->history, "Invalid command.\n");
 }
 
-static void chat_onDraw(ToxWindow *self)
+static void chat_onDraw(ToxWindow *self, Messenger *m)
 {
     curs_set(1);
     int x, y;
diff --git a/testing/toxic/dhtstatus.c b/testing/toxic/dhtstatus.c
index a11dc616..6c9f2a80 100644
--- a/testing/toxic/dhtstatus.c
+++ b/testing/toxic/dhtstatus.c
@@ -34,9 +34,9 @@ static void dhtstatus_onKey(ToxWindow *self, Messenger *m, int key)
     }
 }
 
-static void dhtstatus_onDraw(ToxWindow *self)
+static void dhtstatus_onDraw(ToxWindow *self, Messenger *m)
 {
-    Client_data   *close_clientlist = DHT_get_close_list();
+    Client_data   *close_clientlist = DHT_get_close_list(m->dht);
     curs_set(0);
     werase(self->window);
 
diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c
index 0a58bc54..2e46f124 100644
--- a/testing/toxic/friendlist.c
+++ b/testing/toxic/friendlist.c
@@ -102,7 +102,7 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
     }
 }
 
-static void friendlist_onDraw(ToxWindow *self)
+static void friendlist_onDraw(ToxWindow *self, Messenger *m)
 {
     curs_set(0);
     werase(self->window);
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 9abe8de4..e5525e94 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -90,11 +90,11 @@ static Messenger *init_tox()
 #define MAXSERVERS 50
 
 /* Connects to a random DHT server listed in the DHTservers file */
-int init_connection(void)
+int init_connection(Messenger *m)
 {
     FILE *fp = NULL;
-    
-    if (DHT_isconnected())
+
+    if (DHT_isconnected(m->dht))
         return 0;
 
     fp = fopen(SRVLIST_FILE, "r");
@@ -135,7 +135,7 @@ int init_connection(void)
 
     dht.ip.i = resolved_address;
     unsigned char *binary_string = hex_string_to_bin(key);
-    DHT_bootstrap(dht, binary_string);
+    DHT_bootstrap(m->dht, dht, binary_string);
     free(binary_string);
     return 0;
 }
@@ -146,18 +146,18 @@ static void do_tox(Messenger *m, ToxWindow *prompt)
     static int conn_err = 0;
     static bool dht_on = false;
 
-    if (!dht_on && !DHT_isconnected() && !(conn_try++ % 100)) {
+    if (!dht_on && !DHT_isconnected(m->dht) && !(conn_try++ % 100)) {
         if (!conn_err) {
-            conn_err = init_connection();
+            conn_err = init_connection(m);
             wprintw(prompt->window, "\nEstablishing connection...\n");
 
             if (conn_err)
                 wprintw(prompt->window, "\nAuto-connect failed with error code %d\n", conn_err);
         }
-    } else if (!dht_on && DHT_isconnected()) {
+    } else if (!dht_on && DHT_isconnected(m->dht)) {
         dht_on = true;
         wprintw(prompt->window, "\nDHT connected.\n");
-    } else if (dht_on && !DHT_isconnected()) {
+    } else if (dht_on && !DHT_isconnected(m->dht)) {
         dht_on = false;
         wprintw(prompt->window, "\nDHT disconnected. Attempting to reconnect.\n");
     }
@@ -297,7 +297,7 @@ int main(int argc, char *argv[])
             strcpy(DATA_FILE, user_config_dir);
             strcat(DATA_FILE, CONFIGDIR);
             strcat(DATA_FILE, "data");
-            
+
             SRVLIST_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("DHTservers") + 1);
             strcpy(SRVLIST_FILE, user_config_dir);
             strcat(SRVLIST_FILE, CONFIGDIR);
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 81f00bce..e194a90e 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -204,7 +204,7 @@ void cmd_connect(ToxWindow *self, Messenger *m, char **args)
 
     dht.ip.i = resolved_address;
     unsigned char *binary_string = hex_string_to_bin(key);
-    DHT_bootstrap(dht, binary_string);
+    DHT_bootstrap(m->dht, dht, binary_string);
     free(binary_string);
 }
 
@@ -365,7 +365,9 @@ static void execute(ToxWindow *self, Messenger *m, char *u_cmd)
             cmd[i] = '\0';
 
             int j = i;
+
             while (++j < MAX_STR_SIZE && isspace(cmd[j]));
+
             i = j - 1;
 
             numargs++;
@@ -460,7 +462,7 @@ static void prompt_onKey(ToxWindow *self, Messenger *m, int key)
     }
 }
 
-static void prompt_onDraw(ToxWindow *self)
+static void prompt_onDraw(ToxWindow *self, Messenger *m)
 {
     curs_set(1);
     int x, y;
diff --git a/testing/toxic/windows.c b/testing/toxic/windows.c
index c0ff3026..8fdf4e19 100644
--- a/testing/toxic/windows.c
+++ b/testing/toxic/windows.c
@@ -88,23 +88,25 @@ int add_window(Messenger *m, ToxWindow w)
 {
     if (LINES < 2)
         return -1;
- 
+
     int i;
-    for(i = 0; i < MAX_WINDOWS_NUM; i++) {
-        if (windows[i].window) 
+
+    for (i = 0; i < MAX_WINDOWS_NUM; i++) {
+        if (windows[i].window)
             continue;
-        
+
         w.window = newwin(LINES - 2, COLS, 0, 0);
+
         if (w.window == NULL)
             return -1;
 
         windows[i] = w;
         w.onInit(&w, m);
-    
-        active_window = windows+i;
+
+        active_window = windows + i;
         return i;
     }
-    
+
     return -1;
 }
 
@@ -113,8 +115,10 @@ void del_window(ToxWindow *w)
 {
     active_window = windows; // Go to prompt screen
     delwin(w->window);
+
     if (w->x)
         free(w->x);
+
     w->window = NULL;
     memset(w, 0, sizeof(ToxWindow));
     clear();
@@ -124,19 +128,19 @@ void del_window(ToxWindow *w)
 /* Shows next window when tab or back-tab is pressed */
 void set_next_window(int ch)
 {
-    ToxWindow *end = windows+MAX_WINDOWS_NUM-1;
+    ToxWindow *end = windows + MAX_WINDOWS_NUM - 1;
     ToxWindow *inf = active_window;
-    while(true) {
+
+    while (true) {
         if (ch == '\t') {
             if (++active_window > end)
                 active_window = windows;
-        } else 
-            if (--active_window < windows)
-                active_window = end;
-        
+        } else if (--active_window < windows)
+            active_window = end;
+
         if (active_window->window)
             return;
-    
+
         if (active_window == inf) {    // infinite loop check
             endwin();
             exit(2);
@@ -148,14 +152,14 @@ void set_active_window(int index)
 {
     if (index < 0 || index >= MAX_WINDOWS_NUM)
         return;
-    
-    active_window = windows+index;
+
+    active_window = windows + index;
 }
 
 ToxWindow *init_windows()
 {
     int n_prompt = add_window(m, new_prompt());
-    
+
     if (n_prompt == -1
             || add_window(m, new_friendlist()) == -1
             || add_window(m, new_dhtstatus()) == -1) {
@@ -166,7 +170,7 @@ ToxWindow *init_windows()
 
     prompt = &windows[n_prompt];
     active_window = prompt;
-    
+
     return prompt;
 }
 
@@ -189,7 +193,7 @@ static void draw_bar()
 
     for (i = 0; i < (MAX_WINDOWS_NUM); ++i) {
         if (windows[i].window) {
-            if (windows+i == active_window)
+            if (windows + i == active_window)
                 attron(A_BOLD);
 
             odd = (odd + 1) % blinkrate;
@@ -197,13 +201,13 @@ static void draw_bar()
             if (windows[i].blink && (odd < (blinkrate / 2)))
                 attron(COLOR_PAIR(3));
 
-            clrtoeol();
+            clrtoeol();
             printw(" %s", windows[i].title);
 
             if (windows[i].blink && (odd < (blinkrate / 2)))
                 attroff(COLOR_PAIR(3));
 
-            if (windows+i == active_window) {
+            if (windows + i == active_window) {
                 attroff(A_BOLD);
             }
         }
@@ -225,7 +229,7 @@ void draw_active_window(Messenger *m)
     prepare_window(a->window);
     a->blink = false;
     draw_bar();
-    a->onDraw(a);
+    a->onDraw(a, m);
 
     /* Handle input */
     int ch = getch();
diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h
index be5557e9..86917dbe 100644
--- a/testing/toxic/windows.h
+++ b/testing/toxic/windows.h
@@ -24,7 +24,7 @@ typedef struct ToxWindow_ ToxWindow;
 
 struct ToxWindow_ {
     void(*onKey)(ToxWindow *, Messenger *, int);
-    void(*onDraw)(ToxWindow *);
+    void(*onDraw)(ToxWindow *, Messenger *);
     void(*onInit)(ToxWindow *, Messenger *);
     void(*onFriendRequest)(ToxWindow *, uint8_t *, uint8_t *, uint16_t);
     void(*onMessage)(ToxWindow *, Messenger *, int, uint8_t *, uint16_t);