5 files changed, 135 insertions, 106 deletions

diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index d14f9781..09e6dfe0 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -54,10 +54,10 @@ void print_clientlist(DHT *dht)
     IP_Port p_ip;
     printf("___________________CLOSE________________________________\n");
 
-    for (i = 0; i < 32; i++) {
+    for (i = 0; i < LCLIENT_LIST; i++) {
         printf("ClientID: ");
 
-        for (j = 0; j < 32; j++) {
+        for (j = 0; j < CLIENT_ID_SIZE; j++) {
             printf("%02hhX", dht->close_clientlist[i].client_id[j]);
         }
 
@@ -81,7 +81,7 @@ void print_friendlist(DHT *dht)
         printf("FRIEND %u\n", k);
         printf("ID: ");
 
-        for (j = 0; j < 32; j++) {
+        for (j = 0; j < CLIENT_ID_SIZE; j++) {
             printf("%c", dht->friends_list[k].client_id[j]);
         }
 
@@ -90,10 +90,10 @@ void print_friendlist(DHT *dht)
 
         printf("\nCLIENTS IN LIST:\n\n");
 
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < MAX_FRIEND_CLIENTS; i++) {
             printf("ClientID: ");
 
-            for (j = 0; j < 32; j++) {
+            for (j = 0; j < CLIENT_ID_SIZE; j++) {
                 if (dht->friends_list[k].client_list[i].client_id[j] < 16)
                     printf("0");
 
diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index 067b6ead..bd499ab6 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -13,8 +13,8 @@ nTox_CFLAGS =           $(LIBSODIUM_CFLAGS) \
 nTox_LDADD =            $(LIBSODIUM_LDFLAGS) \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
-                        $(NCURSES_LIBS)
-
+                        $(NCURSES_LIBS) \
+                        $(WINSOCK2_LIBS)
 endif
 
 
diff --git a/testing/misc_tools.h b/testing/misc_tools.h
index 1379b31a..0ffd51e7 100644
--- a/testing/misc_tools.h
+++ b/testing/misc_tools.h
@@ -26,6 +26,7 @@
 
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h> /* for memcpy() */
 
 unsigned char *hex_string_to_bin(char hex_string[]);
 
@@ -33,40 +34,41 @@ unsigned char *hex_string_to_bin(char hex_string[]);
  * wiki.tox.im/index.php/Internal_functions_and_data_structures#Debugging
  *********************************************************/
 #ifdef DEBUG
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+    #include <assert.h>
+    #include <stdio.h>
+    #include <string.h>
 
-#define DEBUG_PRINT(str, ...) do { \
+    #define DEBUG_PRINT(str, ...) do { \
         char msg[1000]; \
         sprintf(msg, "%s(): line %d (file %s): %s%%c\n", __FUNCTION__, __LINE__, __FILE__, str); \
         fprintf(stderr, msg, __VA_ARGS__); \
     } while (0)
 
-#define WARNING(...) do { \
+    #define WARNING(...) do { \
         fprintf(stderr, "warning in "); \
         DEBUG_PRINT(__VA_ARGS__, ' '); \
     } while (0)
 
-#define INFO(...) do { \
+    #define INFO(...) do { \
         DEBUG_PRINT(__VA_ARGS__, ' '); \
     } while (0)
 
-#undef ERROR
-#define ERROR(exit_status, ...) do { \
+    #undef ERROR
+    #define ERROR(exit_status, ...) do { \
         fprintf(stderr, "error in "); \
         DEBUG_PRINT(__VA_ARGS__, ' '); \
         exit(exit_status); \
     } while (0)
 #else
-#define WARNING(...)
-#define INFO(...)
-#undef ERROR
-#define ERROR(...)
+    #define WARNING(...)
+    #define INFO(...)
+    #undef ERROR
+    #define ERROR(...)
 #endif // DEBUG
 
 /************************Linked List***********************
  * http://wiki.tox.im/index.php/Internal_functions_and_data_structures#Linked_List
+ * TODO: Update wiki.
  **********************************************************/
 
 #define MEMBER_OFFSET(var_name_in_parent, parent_type) \
@@ -76,22 +78,22 @@ unsigned char *hex_string_to_bin(char hex_string[]);
    ((parent_type*)((uint64_t)(&(var)) - (uint64_t)(MEMBER_OFFSET(var_name_in_parent, parent_type))))
 
 #define TOX_LIST_FOR_EACH(lst, tmp_name) \
-   for (tox_list_t* tmp_name = lst.next; tmp_name != &lst; tmp_name = tmp_name->next)
+   for (tox_list* tmp_name = lst.next; tmp_name != &lst; tmp_name = tmp_name->next)
 
 #define TOX_LIST_GET_VALUE(tmp_name, name_in_parent, parent_type) GET_PARENT(tmp_name, name_in_parent, parent_type)
 
 typedef struct tox_list {
     struct tox_list *prev, *next;
-} tox_list_t;
+} tox_list;
 
 /* Returns a new tox_list_t. */
-static inline void tox_list_new(tox_list_t *lst)
+static inline void tox_list_new(tox_list *lst)
 {
     lst->prev = lst->next = lst;
 }
 
 /* Inserts a new tox_lst after lst and returns it. */
-static inline void tox_list_add(tox_list_t *lst, tox_list_t *new_lst)
+static inline void tox_list_add(tox_list *lst, tox_list *new_lst)
 {
     tox_list_new(new_lst);
 
@@ -102,61 +104,55 @@ static inline void tox_list_add(tox_list_t *lst, tox_list_t *new_lst)
     new_lst->prev = lst;
 }
 
-static inline void tox_list_remove(tox_list_t *lst)
+static inline void tox_list_remove(tox_list *lst)
 {
     lst->prev->next = lst->next;
     lst->next->prev = lst->prev;
 }
 
 /****************************Array***************************
- * Array to store pointers which tracks it's own size.
- * TODO: Figure out if it shold store values instead of
- * pointers?
+ * Array which manages its own memory allocation.
+ * It stores copy of data (not pointers).
  * TODO: Add wiki info usage.
  ************************************************************/
 
-struct tox_array {
-    void **data;
-    uint32_t size, length;
-};
+typedef struct tox_array {
+    void *data;
+    uint32_t len;
+    size_t elem_size; /* in bytes */
+} tox_array;
 
-static inline void tox_array_init(struct tox_array *arr)
+static inline void tox_array_init(tox_array *arr, size_t elem_size)
 {
-    arr->size = 1;
-    arr->length = 0;
-    arr->data = malloc(sizeof(void *));
+    arr->len = 0;
+    arr->elem_size = elem_size;
+    arr->data = NULL;
 }
 
-static inline void tox_array_delete(struct tox_array *arr)
+static inline void tox_array_delete(tox_array *arr)
 {
     free(arr->data);
-    arr->size = arr->length = 0;
+    arr->len = arr->elem_size = 0;
 }
 
-/* shrinks arr so it will not have unused space. If you want to have
- * addtional space, extra species the amount of extra space.
- */
-static inline void tox_array_shrink_to_fit(struct tox_array *arr, int32_t extra)
-{
-    arr->size = arr->length + extra;
-    arr->data = realloc(arr->data, arr->size * sizeof(void *));
-}
-
-static inline void _tox_array_push(struct tox_array *arr, void *new)
+static inline void _tox_array_push(tox_array *arr, uint8_t *item)
 {
-    if (arr->length + 1 >= arr->size)
-        tox_array_shrink_to_fit(arr, arr->size);
+    arr->data = realloc(arr->data, arr->elem_size * (arr->len+1));
 
-    arr->data[arr->length++] = new;
+    memcpy(arr->data + arr->elem_size*arr->len, item, arr->elem_size);
+    arr->len++;
 }
-#define tox_array_push(arr, new) _tox_array_push(arr, (void*)new)
+#define tox_array_push(arr, item) _tox_array_push(arr, (void*)(&(item)))
 
-static inline void *tox_array_pop(struct tox_array *arr)
+/* Deletes num items from array.
+ * Not same as pop in stacks, because to access elements you use data.
+ */
+static inline void tox_array_pop(tox_array *arr, uint32_t num)
 {
-    if (arr->length - 1 < arr->size / 4)
-        tox_array_shrink_to_fit(arr, arr->length * 2);
-
-    return arr->data[arr->length--];
+    arr->len--;
+    arr->data = realloc(arr->data, arr->elem_size*arr->len);
 }
 
+#define tox_array_get(arr, i, type) ((type*)(arr)->data)[i]
+
 #endif // MISC_TOOLS_H
diff --git a/testing/nTox.c b/testing/nTox.c
index 9df1e78b..128e729d 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -20,13 +20,30 @@
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#ifdef HAVE_CONFIG_H
+    #include "config.h"
+#endif
+
+#ifdef __WIN32__
+    #define _WIN32_WINNT 0x501
+    #include <winsock2.h>
+    #include <ws2tcpip.h>
+#else
+    #include <sys/socket.h>
+    #include <netinet/in.h>
+    #include <arpa/inet.h>
+    #include <sys/types.h>
+    #include <netdb.h>
+#endif
+
+
 #include "nTox.h"
 #include "misc_tools.h"
 
 #include <stdio.h>
 #include <time.h>
 
-#ifdef WIN32
+#ifdef __WIN32__
 #define c_sleep(x) Sleep(1*x)
 #else
 #include <unistd.h>
@@ -50,6 +67,67 @@ typedef struct {
 Friend_request pending_requests[256];
 uint8_t num_requests = 0;
 
+/*
+  resolve_addr():
+    address should represent IPv4 or a hostname with A record
+
+    returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
+    returns 0 on failure
+
+    TODO: Fix ipv6 support
+*/
+
+uint32_t resolve_addr(const char *address)
+{
+    struct addrinfo *server = NULL;
+    struct addrinfo  hints;
+    int              rc;
+    uint32_t         addr;
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_family   = AF_INET;    // IPv4 only right now.
+    hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses.
+
+#ifdef __WIN32__
+    int res;
+    WSADATA wsa_data;
+
+    res = WSAStartup(MAKEWORD(2, 2), &wsa_data);
+    if (res != 0)
+    {
+        return 0;
+    }
+#endif
+
+    rc = getaddrinfo(address, "echo", &hints, &server);
+
+    // Lookup failed.
+    if (rc != 0) {
+#ifdef __WIN32__
+        WSACleanup();
+#endif
+        return 0;
+    }
+
+    // IPv4 records only..
+    if (server->ai_family != AF_INET) {
+        freeaddrinfo(server);
+#ifdef __WIN32__
+        WSACleanup();
+#endif
+        return 0;
+    }
+
+
+    addr = ((struct sockaddr_in *)server->ai_addr)->sin_addr.s_addr;
+
+    freeaddrinfo(server);
+#ifdef __WIN32__
+        WSACleanup();
+#endif
+    return addr;
+}
+
 void get_id(Tox *m, char *data)
 {
     sprintf(data, "[i] ID: ");
@@ -525,7 +603,7 @@ int main(int argc, char *argv[])
     free(binary_string);
     nodelay(stdscr, TRUE);
 
-    while (true) {
+    while (1) {
         if (on == 0 && tox_isconnected(m)) {
             new_lines("[i] connected to DHT\n[i] define username with /n");
             on = 1;
@@ -542,7 +620,7 @@ int main(int argc, char *argv[])
 
         getmaxyx(stdscr, y, x);
 
-        if (c == '\n') {
+        if ((c == 0x0d) || (c == 0x0a)) {
             line_eval(m, line);
             strcpy(line, "");
         } else if (c == 8 || c == 127) {
diff --git a/testing/nTox.h b/testing/nTox.h
index df9d404a..a72ce0c2 100644
--- a/testing/nTox.h
+++ b/testing/nTox.h
@@ -27,61 +27,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ncurses.h>
 #include <curses.h>
 #include <ctype.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <netdb.h>
+
 #include "../toxcore/tox.h"
 
 #define STRING_LENGTH 256
 #define HISTORY 50
 #define PUB_KEY_BYTES 32
 
-/*
-  resolve_addr():
-    address should represent IPv4 or a hostname with A record
-
-    returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
-    returns 0 on failure
-
-    TODO: Fix ipv6 support
-*/
-
-uint32_t resolve_addr(const char *address)
-{
-    struct addrinfo *server = NULL;
-    struct addrinfo  hints;
-    int              rc;
-    uint32_t         addr;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family   = AF_INET;    // IPv4 only right now.
-    hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses.
-
-    rc = getaddrinfo(address, "echo", &hints, &server);
-
-    // Lookup failed.
-    if (rc != 0) {
-        return 0;
-    }
-
-    // IPv4 records only..
-    if (server->ai_family != AF_INET) {
-        freeaddrinfo(server);
-        return 0;
-    }
-
-
-    addr = ((struct sockaddr_in *)server->ai_addr)->sin_addr.s_addr;
-
-    freeaddrinfo(server);
-    return addr;
-}
-
+uint32_t resolve_addr(const char *address);
 void new_lines(char *line);
 void line_eval(Tox *m, char *line);
 void wrap(char output[STRING_LENGTH], char input[STRING_LENGTH], int line_width) ;