22 files changed, 259 insertions, 207 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 9a81fba7..d14796f8 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -68,9 +68,14 @@ Advance configure options:
   - --prefix=/where/to/install
   - --with-libsodium-headers=/path/to/libsodium/include/
   - --with-libsodium-libs=/path/to/sodiumtest/lib/
-  - --BUILD_DHT_BOOTSTRAP_DAEMON="yes"
-  - --BUILD_NTOX="yes"
-  - --BUILD_TESTS="yes"
+  - --enable-silent-rules less verbose build output (undo: "make V=1")
+  - --disable-silent-rules verbose build output (undo: "make V=0")
+  - --disable-tests build unit tests (default: auto)
+  - --disable-ntox build nTox client (default: auto)
+  - --disable-dht-bootstrap-daemon build DHT bootstrap daemon (default: auto)
+  - --enable-shared[=PKGS]  build shared libraries [default=yes]
+  - --enable-static[=PKGS]  build static libraries [default=yes]
+
 <a name="osx" />
 ###OS X:
 
@@ -99,6 +104,13 @@ Advance configure options:
   - --BUILD_DHT_BOOTSTRAP_DAEMON="yes"
   - --BUILD_NTOX="yes"
   - --BUILD_TESTS="yes"
+  - --enable-silent-rules less verbose build output (undo: "make V=1")
+  - --disable-silent-rules verbose build output (undo: "make V=0")
+  - --disable-tests build unit tests (default: auto)
+  - --disable-ntox build nTox client (default: auto)
+  - --disable-dht-bootstrap-daemon build DHT bootstrap daemon (default: auto)
+  - --enable-shared[=PKGS]  build shared libraries [default=yes]
+  - --enable-static[=PKGS]  build static libraries [default=yes]
 
 <a name="non-homebrew" />
 ####Non-homebrew:
@@ -137,7 +149,13 @@ Advance configure options:
   - --BUILD_DHT_BOOTSTRAP_DAEMON="yes"
   - --BUILD_NTOX="yes"
   - --BUILD_TESTS="yes"
-
+  - --enable-silent-rules less verbose build output (undo: "make V=1")
+  - --disable-silent-rules verbose build output (undo: "make V=0")
+  - --disable-tests build unit tests (default: auto)
+  - --disable-ntox build nTox client (default: auto)
+  - --disable-dht-bootstrap-daemon build DHT bootstrap daemon (default: auto)
+  - --enable-shared[=PKGS]  build shared libraries [default=yes]
+  - --enable-static[=PKGS]  build static libraries [default=yes]
 
 Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory
 (or the wrong version gets installed) and make your life more annoying.
@@ -175,3 +193,14 @@ Advance configure options:
   - --BUILD_DHT_BOOTSTRAP_DAEMON="yes"
   - --BUILD_NTOX="yes"
   - --BUILD_TESTS="yes"
+  - --enable-silent-rules less verbose build output (undo: "make V=1")
+  - --disable-silent-rules verbose build output (undo: "make V=0")
+  - --disable-tests build unit tests (default: auto)
+  - --disable-ntox build nTox client (default: auto)
+  - --disable-dht-bootstrap-daemon build DHT bootstrap daemon (default: auto)
+  - --enable-shared[=PKGS]  build shared libraries [default=yes]
+  - --enable-static[=PKGS]  build static libraries [default=yes]
+
+<a name="Clients" />
+####Clients:
+While [Toxic](https://github.com/tox/toxic) is no longer in core, a list of Tox clients are located in our [wiki](http://wiki.tox.im/client)
diff --git a/Makefile.am b/Makefile.am
index 7824ecb0..119b8786 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS = build
 
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(top_builddir)/libtoxcore.pc
diff --git a/configure.ac b/configure.ac
index 381b99c9..a16f6a4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,17 @@ AM_INIT_AUTOMAKE([1.10 -Wall])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_MACRO_DIR([m4])
 
+LIBTOXCORE_LT_VERSION=0:0:0
+dnl
+dnl            current:revision:age
+dnl
+dnl current:  increment if interfaces have been added, removed or changed
+dnl revision: increment if source code has changed, set to zero if current is
+dnl           incremented
+dnl age:      increment if interfaces have been added, set to zero if
+dnl           interfaces have been removed or changed
+EXTRA_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
+
 if test "x${prefix}" = "xNONE"; then
     prefix="${ac_default_prefix}"
 fi
@@ -96,6 +107,7 @@ AC_ARG_WITH(libsodium-libs,
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
 WIN32=no
@@ -103,15 +115,21 @@ AC_CANONICAL_HOST
 case $host_os in
     *mingw*)
         WIN32="yes"
-        AC_MSG_WARN([nTox is not supported on $host_os yet, disabling])
-        BUILD_NTOX="no"
+        EXTRA_LT_LDFLAGS="$EXTRA_LT_LDFLAGS -no-undefined"
     ;;
     *solaris*)
         LIBS="$LIBS -lssp -lsocket -lnsl"
     ;;
+    *freebsd*)
+        LDFLAGS="$LDFLAGS -L/usr/local/lib"
+        CFLAGS="$CFLAGS -I/usr/local/include"
+        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+    ;;
 esac
 AM_CONDITIONAL(WIN32, test "x$WIN32" = "xyes")
 
+AC_SUBST(EXTRA_LT_LDFLAGS)
+
 # Checks for libraries.
 LIBSODIUM_LIBS=
 LIBSODIUM_LDFLAGS=
@@ -131,7 +149,7 @@ else
     AC_CHECK_LIB(sodium, randombytes_random,
         [],
         [
-            AC_MSG_ERROR([required library libsodium was not found on your system, please check http://download.libsodium.org/libsodium/releases/]) 
+            AC_MSG_ERROR([required library libsodium was not found on your system, please check http://download.libsodium.org/libsodium/releases/])
         ]
     )
 fi
@@ -182,9 +200,8 @@ AC_TYPE_UINT8_T
 
 # Checks for library functions.
 AC_FUNC_FORK
-AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([gettimeofday memset socket strchr])
+AC_CHECK_FUNCS([gettimeofday memset socket strchr malloc])
 
 # pkg-config based tests
 PKG_PROG_PKG_CONFIG
@@ -208,7 +225,7 @@ if test -n "$PKG_CONFIG"; then
             ],
             [
                 AC_MSG_WARN([$LIBCONFIG_PKG_ERRORS])
-                AC_MSG_WARN([libconfig not available, will not build DHT botstrap daemon])
+                AC_MSG_WARN([libconfig not available, will not build DHT bootstrap daemon])
                 BUILD_DHT_BOOTSTRAP_DAEMON="no"
             ])
     fi
@@ -223,7 +240,7 @@ if test -n "$PKG_CONFIG"; then
             ])
     fi
 else
-    AC_MSG_WARN([pkg-config was not found on your sytem])
+    AC_MSG_WARN([pkg-config was not found on your system])
 fi
 
 if (test "x$BUILD_NTOX" = "xyes") && (test "x$NCURSES_FOUND" != "xyes"); then
@@ -251,22 +268,41 @@ if (test "x$BUILD_NTOX" = "xyes") && (test "x$NCURSES_FOUND" != "xyes"); then
             ]
         )
         if test "x$BUILD_NTOX" = "xyes"; then
-            AC_CHECK_LIB([ncurses], [clear],
-                [],
-                [
-                    unset ac_cv_lib_ncurses_clear
-                    AC_CHECK_LIB([ncurses], [clear],
-                        [],
-                        [
-                            AC_MSG_WARN([not building nTox client because required library ncurses was not found on your system])
-                            BUILD_NTOX="no"
-                        ],
-                        [
-                            -ltinfo
-                        ]
-                    )
-                ]
-            )
+            if test "x$WIN32" = "xyes"; then
+                AC_CHECK_LIB([pdcurses], [clear],
+                    [
+                        NCURSES_LIBS="-lpdcurses"
+                        AC_SUBST(NCURSES_LIBS)
+                    ],
+                    [
+                        AC_MSG_ERROR([required library pdcurses was not found on your system])
+                        BUILD_NTOX="no"
+                    ]
+                )
+            else
+                AC_CHECK_LIB([ncurses], [clear],
+                    [
+                        NCURSES_LIBS="-lncurses"
+                        AC_SUBST(NCURSES_LIBS)
+                    ],
+                    [
+                        unset ac_cv_lib_ncurses_clear
+                        AC_CHECK_LIB([ncurses], [clear],
+                            [
+                                NCURSES_LIBS="-lncurses -ltinfo"
+                                AC_SUBST(NCURSES_LIBS)
+                            ],
+                            [
+                                AC_MSG_WARN([not building nTox client because required library ncurses was not found on your system])
+                                BUILD_NTOX="no"
+                            ],
+                            [
+                                -ltinfo
+                            ]
+                        )
+                    ]
+                )
+            fi
         fi
     fi
 fi
diff --git a/other/DHTservers b/other/DHTservers
index bf2d2728..1fb86cd3 100644
--- a/other/DHTservers
+++ b/other/DHTservers
@@ -1,5 +1,5 @@
 192.81.133.111 33445 8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858
-66.175.223.88 33445 AC4112C975240CAD260BB2FCD134266521FAAF0A5D159C5FD3201196191E4F5D
+66.175.223.88 33445 B24E2FB924AE66D023FE1E42A2EE3B432010206F751A2FFD3E297383ACF1572E
 192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143
 192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67
 81.224.34.47 443 48F0D94C0D54EB1995A2ECEDE7DB6BDD5E05D81704B2F3D1BB9FE43AC97B7269
diff --git a/other/fun/sign.c b/other/fun/sign.c
index 44485bb5..423d974a 100644
--- a/other/fun/sign.c
+++ b/other/fun/sign.c
@@ -1,5 +1,5 @@
 /* Binary signer/checker using ed25519
- * 
+ *
  * Compile with:
  *  gcc -o sign sign.c -lsodium
  *
@@ -60,6 +60,7 @@ int main(int argc, char *argv[])
 {
     unsigned char pk[crypto_sign_ed25519_PUBLICKEYBYTES];
     unsigned char sk[crypto_sign_ed25519_SECRETKEYBYTES];
+
     if (argc == 2 && argv[1][0] == 'g') {
         crypto_sign_ed25519_keypair(pk, sk);
         printf("Public key:\n");
@@ -89,12 +90,15 @@ int main(int argc, char *argv[])
         unsigned long long smlen;
         char *sm = malloc(size + crypto_sign_ed25519_BYTES * 2);
         crypto_sign_ed25519(sm, &smlen, data, size, secret_key);
+
         if (smlen - size != crypto_sign_ed25519_BYTES)
             goto fail;
+
         FILE *f = fopen(argv[4], "wb");
 
         if (f == NULL)
             goto fail;
+
         memcpy(sm + smlen, sm, crypto_sign_ed25519_BYTES); // Move signature from beginning to end of file.
 
         if (fwrite(sm + (smlen - size), 1, smlen, f) != smlen)
@@ -113,7 +117,8 @@ int main(int argc, char *argv[])
             goto fail;
 
         char *signe = malloc(size + crypto_sign_ed25519_BYTES);
-        memcpy(signe, data + size - crypto_sign_ed25519_BYTES, crypto_sign_ed25519_BYTES); // Move signature from end to beginning of file.
+        memcpy(signe, data + size - crypto_sign_ed25519_BYTES,
+               crypto_sign_ed25519_BYTES); // Move signature from end to beginning of file.
         memcpy(signe + crypto_sign_ed25519_BYTES, data, size - crypto_sign_ed25519_BYTES);
         unsigned long long smlen;
         char *m = malloc(size);
@@ -123,12 +128,13 @@ int main(int argc, char *argv[])
             printf("Failed checking sig.\n");
             goto fail;
         }
+
         printf("Checked successfully.\n");
     }
 
     return 0;
-    
-    fail:
-        printf("FAIL\n");
-        return 1;
+
+fail:
+    printf("FAIL\n");
+    return 1;
 }
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) ;
diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 56e8b052..0e0ead52 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -74,8 +74,8 @@ static int id_closest(uint8_t *id, uint8_t *id1, uint8_t *id2)
 
     for (i = 0; i < CLIENT_ID_SIZE; ++i) {
 
-        distance1 = abs(id[i] ^ id1[i]);
-        distance2 = abs(id[i] ^ id2[i]);
+        distance1 = abs(((int8_t *)id)[i] ^ ((int8_t *)id1)[i]);
+        distance2 = abs(((int8_t *)id)[i] ^ ((int8_t *)id2)[i]);
 
         if (distance1 < distance2)
             return 1;
diff --git a/toxcore/DHT.h b/toxcore/DHT.h
index e4ba2154..b53801b5 100644
--- a/toxcore/DHT.h
+++ b/toxcore/DHT.h
@@ -26,10 +26,6 @@
 
 #include "net_crypto.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 
 /* Size of the client_id in bytes. */
 #define CLIENT_ID_SIZE crypto_box_PUBLICKEYBYTES
@@ -126,7 +122,7 @@ int DHT_delfriend(DHT *dht, uint8_t *client_id);
  *  port must be 2 bytes long.
  *  returns ip if success.
  *  returns ip of 0 if failure (This means the friend is either offline or we have not found him yet).
- *  returns ip of 1 if friend is not in list. 
+ *  returns ip of 1 if friend is not in list.
  */
 IP_Port DHT_getfriendip(DHT *dht, uint8_t *client_id);
 
@@ -195,8 +191,5 @@ int DHT_isconnected(DHT *dht);
 
 void addto_lists(DHT *dht, IP_Port ip_port, uint8_t *client_id);
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif
diff --git a/toxcore/LAN_discovery.h b/toxcore/LAN_discovery.h
index e570908e..7bbe775e 100644
--- a/toxcore/LAN_discovery.h
+++ b/toxcore/LAN_discovery.h
@@ -35,9 +35,6 @@
 #include <linux/netdevice.h>
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Send a LAN discovery pcaket to the broadcast address with port port. */
 int send_LANdiscovery(uint16_t port, Net_Crypto *c);
@@ -48,8 +45,4 @@ void LANdiscovery_init(DHT *dht);
 
 
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/toxcore/Lossless_UDP.h b/toxcore/Lossless_UDP.h
index 216e95d0..cd822e72 100644
--- a/toxcore/Lossless_UDP.h
+++ b/toxcore/Lossless_UDP.h
@@ -26,9 +26,6 @@
 
 #include "network.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Maximum length of the data in the data packets. */
 #define MAX_DATA_SIZE 1024
@@ -215,8 +212,5 @@ Lossless_UDP *new_lossless_udp(Networking_Core *net);
 
 void kill_lossless_udp(Lossless_UDP *ludp);
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
index 2fd93a22..da07db41 100644
--- a/toxcore/Makefile.inc
+++ b/toxcore/Makefile.inc
@@ -1,5 +1,3 @@
-LIBTOXCORE_VERSION = 0:0:0
-
 lib_LTLIBRARIES = libtoxcore.la
 
 libtoxcore_la_include_HEADERS = \
@@ -33,8 +31,8 @@ libtoxcore_la_CFLAGS =  -I$(top_srcdir) \
                         -I$(top_srcdir)/toxcore \
                         $(LIBSODIUM_CFLAGS)
 
-libtoxcore_la_LDFLAGS = -version-info $(LIBTOXCORE_VERSION) \
-                        $(LIBSODIUM_LDFLAGS)
-
-libtoxcore_la_LIBS =    $(LIBSODIUM_LIBS) \
+libtoxcore_la_LDFLAGS = $(EXTRA_LT_LDFLAGS) \
+                        $(LIBSODIUM_LDFLAGS) \
                         $(WINSOCK2_LIBS)
+
+libtoxcore_la_LIBS =    $(LIBSODIUM_LIBS)
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 01b6b090..4f1c540a 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -242,7 +242,7 @@ int m_addfriend_norequest(Messenger *m, uint8_t *client_id)
 
 /* Remove a friend.
  *  return 0 if success.
- *  return -1 if failure. 
+ *  return -1 if failure.
  */
 int m_delfriend(Messenger *m, int friendnumber)
 {
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index b588fb4b..05b049ae 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -31,10 +31,6 @@
 #include "friend_requests.h"
 #include "LAN_discovery.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define MAX_NAME_LENGTH 128
 #define MAX_STATUSMESSAGE_LENGTH 128
 
@@ -376,8 +372,5 @@ void Messenger_save(Messenger *m, uint8_t *data);
 /* Load the messenger from data of size length. */
 int Messenger_load(Messenger *m, uint8_t *data, uint32_t length);
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif
diff --git a/toxcore/friend_requests.h b/toxcore/friend_requests.h
index 58572488..b5c46056 100644
--- a/toxcore/friend_requests.h
+++ b/toxcore/friend_requests.h
@@ -27,9 +27,6 @@
 #include "DHT.h"
 #include "net_crypto.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 typedef struct {
     uint32_t nospam;
@@ -37,9 +34,9 @@ typedef struct {
     uint8_t handle_friendrequest_isset;
     void *handle_friendrequest_userdata;
 
-/* NOTE: The following is just a temporary fix for the multiple friend requests received at the same time problem.
- *  TODO: Make this better (This will most likely tie in with the way we will handle spam.) 
- */
+    /* NOTE: The following is just a temporary fix for the multiple friend requests received at the same time problem.
+     *  TODO: Make this better (This will most likely tie in with the way we will handle spam.)
+     */
 
 #define MAX_RECEIVED_STORED 32
 
@@ -64,8 +61,5 @@ void callback_friendrequest(Friend_Requests *fr, void (*function)(uint8_t *, uin
 /* Sets up friendreq packet handlers. */
 void friendreq_init(Friend_Requests *fr, Net_Crypto *c);
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index ccf61700..1f00144a 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -540,12 +540,12 @@ int accept_crypto_inbound(Net_Crypto *c, int connection_id, uint8_t *public_key,
     if (connection_id == -1)
         return -1;
 
- /*
-  * if(getcryptconnection_id(public_key) != -1)
-  * {
-  *     return -1;
-  * }
-  */
+    /*
+     * if(getcryptconnection_id(public_key) != -1)
+     * {
+     *     return -1;
+     * }
+     */
     if (realloc_cryptoconnection(c, c->crypto_connections_length + 1) == -1)
         return -1;
 
diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h
index 1fde0297..778837f4 100644
--- a/toxcore/net_crypto.h
+++ b/toxcore/net_crypto.h
@@ -26,10 +26,6 @@
 
 #include "Lossless_UDP.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define MAX_INCOMING 64
 
 #define CRYPTO_PACKET_FRIEND_REQ    32  /* Friend request crypto packet ID. */
@@ -212,8 +208,5 @@ void kill_net_crypto(Net_Crypto *c);
 /* Initialize the cryptopacket handling. */
 void init_cryptopackets(void *dht);
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif
diff --git a/toxcore/network.h b/toxcore/network.h
index 7d699762..0a0122be 100644
--- a/toxcore/network.h
+++ b/toxcore/network.h
@@ -62,9 +62,6 @@
 #define crypto_box_MACBYTES (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES)
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #define MAX_UDP_PACKET_SIZE 65507
 
@@ -156,8 +153,4 @@ Networking_Core *new_networking(IP ip, uint16_t port);
 void kill_networking(Networking_Core *net);
 
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 5a4dcf49..eabdf8ff 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -267,7 +267,7 @@ void tox_callback_read_receipt(Tox *tox, void (*function)(Tox *tox, int, uint32_
  *  Status:
  *    0 -- friend went offline after being previously online
  *    1 -- friend went online
- *  
+ *
  *  NOTE: This callback is not called when adding friends, thus the "after
  *  being previously online" part. it's assumed that when adding friends,
  *  their connection status is offline.