10 files changed, 79 insertions, 88 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 1ee1c66f..3d01d562 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -23,7 +23,7 @@ On Fedora:
 
 ```bash
 yum groupinstall "Development Tools"
-yum install libtool autoconf automake libconfig-devel ncurses-devel cmake check
+yum install libtool autoconf automake libconfig-devel ncurses-devel cmake check check-devel
 ```
 
 Note that `libconfig-dev` should be >= 1.4.
@@ -61,8 +61,8 @@ mkdir build && cd build
 cmake ..
 ```
 Advance cmake options:
-  - `-DSHARED_TOXCORE=ON` (default `OFF`) — Build Core as a shared library.
-  - `-DUSE_NACL=ON` (default `OFF`) — Use NaCl library instead of libsodium.
+  - `-DSHARED_TOXCORE=ON` (default `OFF`) � Build Core as a shared library.
+  - `-DUSE_NACL=ON` (default `OFF`) � Use NaCl library instead of libsodium.
   
 Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only.
 
@@ -150,8 +150,8 @@ mkdir build && cd build
 cmake -G "MinGW Makefiles" ..
 ```
 Advance cmake options:
-  - `-DSHARED_TOXCORE=ON` (default OFF) — Build Core as a shared library.
-  - `-DSHARED_LIBSODIUM=ON` (default OFF) — Link libsodium as a shared library.
+  - `-DSHARED_TOXCORE=ON` (default OFF) � Build Core as a shared library.
+  - `-DSHARED_LIBSODIUM=ON` (default OFF) � Link libsodium as a shared library.
 
 Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only.
 
diff --git a/core/DHT.c b/core/DHT.c
index 1d13aa73..bcaaf6d8 100644
--- a/core/DHT.c
+++ b/core/DHT.c
@@ -319,6 +319,28 @@ static int replace_bad(    Client_data *   list,
 
     return 1;
 }
+/*Sort the list. It will be sorted from furthest to closest. 
+  TODO: this is innefficient and needs to be optimized.*/
+static void sort_list(Client_data *list, uint32_t length, uint8_t *comp_client_id)
+{
+    if(length == 0)
+        return;
+    uint32_t i, count;
+    while(1) {
+        count = 0;
+        for(i = 0; i < (length - 1); ++i) {
+            if(id_closest(comp_client_id, list[i].client_id, list[i + 1].client_id) == 1) {
+                Client_data temp = list[i + 1];
+                list[i + 1] = list[i];
+                list[i] = temp;
+                ++count;
+            }
+        }
+        if(count == 0)
+            return;
+    }
+}
+
 
 /* replace the first good node that is further to the comp_client_id than that of the client_id in the list */
 static int replace_good(   Client_data *   list,
@@ -329,6 +351,7 @@ static int replace_good(   Client_data *   list,
 {
     uint32_t i;
     uint64_t temp_time = unix_time();
+    sort_list(list, length, comp_client_id);
 
     for(i = 0; i < length; ++i)
         if(id_closest(comp_client_id, list[i].client_id, client_id) == 2) {
diff --git a/core/Messenger.c b/core/Messenger.c
index 690a81b1..bed59d4d 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -120,6 +120,7 @@ void getaddress(Messenger *m, uint8_t *address)
  * return FAERR_BADCHECKSUM if bad checksum in address
  * return FAERR_SETNEWNOSPAM if the friend was already there but the nospam was different
  * (the nospam for that friend was set to the new one)
+ * return FAERR_NOMEM if increasing the friend list size fails
  */
 int m_addfriend(Messenger *m, uint8_t *address, uint8_t *data, uint16_t length)
 {
@@ -148,7 +149,8 @@ int m_addfriend(Messenger *m, uint8_t *address, uint8_t *data, uint16_t length)
     }
 
     /* resize the friend list if necessary */
-    realloc_friendlist(m, m->numfriends + 1);
+    if (realloc_friendlist(m, m->numfriends + 1) != 0)
+        return FAERR_NOMEM;
 
     uint32_t i;
     for (i = 0; i <= m->numfriends; ++i)  {
@@ -180,7 +182,8 @@ int m_addfriend_norequest(Messenger *m, uint8_t * client_id)
         return -1;
 
     /* resize the friend list if necessary */
-    realloc_friendlist(m, m->numfriends + 1);
+    if (realloc_friendlist(m, m->numfriends + 1) != 0)
+        return FAERR_NOMEM;
 
     uint32_t i;
     for (i = 0; i <= m->numfriends; ++i) {
@@ -221,7 +224,9 @@ int m_delfriend(Messenger *m, int friendnumber)
             break;
     }
     m->numfriends = i;
-    realloc_friendlist(m, m->numfriends + 1);
+
+    if (realloc_friendlist(m, m->numfriends + 1) != 0)
+        return FAERR_NOMEM;
 
     return 0;
 }
diff --git a/core/Messenger.h b/core/Messenger.h
index a2add19d..e12b3fc8 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -63,6 +63,7 @@ extern "C" {
 #define FAERR_UNKNOWN -5
 #define FAERR_BADCHECKSUM -6
 #define FAERR_SETNEWNOSPAM -7
+#define FAERR_NOMEM -8
 
 /* don't assume MAX_STATUSMESSAGE_LENGTH will stay at 128, it may be increased
     to an absurdly large number later */
@@ -151,6 +152,7 @@ void getaddress(Messenger *m, uint8_t *address);
  * return -6 if bad checksum in address
  * return -7 if the friend was already there but the nospam was different
  * (the nospam for that friend was set to the new one)
+ * return -8 if increasing the friend list size fails
  */
 int m_addfriend(Messenger *m, uint8_t *address, uint8_t *data, uint16_t length);
 
diff --git a/other/DHTservers b/other/DHTservers
index 560c29b5..6efba882 100644
--- a/other/DHTservers
+++ b/other/DHTservers
@@ -3,4 +3,5 @@
 192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143
 192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67
 81.224.34.47 443 48F0D94C0D54EB1995A2ECEDE7DB6BDD5E05D81704B2F3D1BB9FE43AC97B7269
-198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
\ No newline at end of file
+198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
+95.47.140.214 33445 F4BF7C5A9D0EF4CB684090C38DE937FAE1612021F21FEA4DCBFAC6AAFEF58E68
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index 65ba35c0..9e07135c 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -12,7 +12,7 @@ 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)
+#       include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox_win32.cmake)
 else()
         include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/nTox.cmake)
         add_subdirectory(toxic)
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index d2642df1..7739c0a6 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -39,6 +39,8 @@ char line[STRING_LENGTH];
 char users_id[200];
 int friend_request_received;
 
+Messenger *messenger;
+
 void do_header()
 {
     system("cls");
@@ -48,7 +50,7 @@ void do_header()
     printf("\n---------------------------------");
 }
 
-void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
+void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata)
 {
     friend_request_received = 1;
     printf("\n\n[i] received friend request with message\n");
@@ -61,10 +63,10 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
     ++num_requests;
 }
 
-void print_message(int friendnumber, uint8_t * string, uint16_t length)
+void print_message(Messenger *messenger, int friendnumber, uint8_t * string, uint16_t length, void *userdata)
 {
     char name[MAX_NAME_LENGTH];
-    getname(friendnumber, (uint8_t*)name);
+    getname(messenger, friendnumber, (uint8_t*)name);
     char msg[100+length+strlen(name)+1];
     time_t rawtime;
     struct tm * timeinfo;
@@ -77,19 +79,19 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length)
     printf(msg);
 }
 
-void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
+void print_nickchange(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
     char name[MAX_NAME_LENGTH];
-    getname(friendnumber, (uint8_t*)name);
+    getname(messenger, friendnumber, (uint8_t*)name);
     char msg[100+length];
     sprintf(msg, "\n\n[i] [%d] %s is now known as %s.\n\n", friendnumber, name, string);
     printf(msg);
 }
 
-void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
+void print_statuschange(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata)
 {
     char name[MAX_NAME_LENGTH];
-    getname(friendnumber, (uint8_t*)name);
+    getname(messenger, friendnumber, (uint8_t*)name);
     char msg[100+length+strlen(name)+1];
     sprintf(msg, "\n\n[i] [%d] %s's status changed to %s.\n\n", friendnumber, name, string);
     printf(msg);
@@ -109,11 +111,11 @@ void load_key()
             exit(1);
         }
 
-        Messenger_load(data, size);
+        Messenger_load(messenger, data, size);
     } else {
-        int size = Messenger_size();
+        int size = Messenger_size(messenger);
         uint8_t data[size];
-        Messenger_save(data);
+        Messenger_save(messenger, data);
         fclose(data_file);
         data_file = fopen("data", "w");
 
@@ -133,7 +135,7 @@ void add_friend()
     for (i = 0; i < 128; i++)
         temp_id[i] = line[i+3];
     
-    int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
+    int num = m_addfriend(messenger, hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
    
     if (num >= 0) {
         char numstring[100];
@@ -167,8 +169,8 @@ void list_friends()
 
     for (i = 0; i <= maxnumfriends; i++) {
         char name[MAX_NAME_LENGTH];
-        getname(i, (uint8_t*)name);
-        if (m_friendstatus(i) > 0 && m_friendstatus(i) < 4)
+        getname(messenger, i, (uint8_t*)name);
+        if (m_friendstatus(messenger, i) > 0 && m_friendstatus(messenger, i) < 4)
             printf("[%d] %s\n", i, (uint8_t*)name);
     }
     
@@ -178,9 +180,9 @@ void list_friends()
 
     for (i = 0; i <= maxnumfriends; i++) {
         char name[MAX_NAME_LENGTH];
-        getname(i, (uint8_t*)name);
+        getname(messenger, i, (uint8_t*)name);
         
-        if (m_friendstatus(i) == 4)
+        if (m_friendstatus(messenger, i) == 4)
             printf("[%d] %s\n", i, (uint8_t*)name);
     }
 
@@ -199,7 +201,7 @@ void delete_friend()
     }
     
     int num = atoi(numstring);
-    m_delfriend(num);
+    m_delfriend(messenger, num);
     --maxnumfriends;
     printf("\n\n");
 }
@@ -228,7 +230,7 @@ void message_friend()
 
     int num = atoi(numstring);
 
-    if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1)
+    if(m_sendmessage(messenger, num, (uint8_t*) message, sizeof(message)) != 1)
         printf("\n[i] could not send message (they may be offline): %s\n", message);
    
     else
@@ -250,7 +252,7 @@ void change_nickname()
     }
     
     name[i-3] = 0;
-    setname(name, i);
+    setname(messenger, name, i);
     char numstring[100];
     sprintf(numstring, "\n[i] changed nick to %s\n\n", (char*)name);
     printf(numstring);
@@ -275,7 +277,7 @@ void change_status(int savetofile)
     }
 
     status[i-3] = 0;
-    m_set_statusmessage(status, strlen((char*)status));
+    m_set_statusmessage(messenger, status, strlen((char*)status));
     char numstring[100];
     sprintf(numstring, "\n[i] changed status to %s\n\n", (char*)status);
     printf(numstring);
@@ -297,7 +299,7 @@ void accept_friend_request()
         sprintf(numchar, "\n[i] you either didn't receive that request or you already accepted it");
         printf(numchar);
     } else {
-        int num = m_addfriend_norequest(pending_requests[numf].id);
+        int num = m_addfriend_norequest(messenger, pending_requests[numf].id);
         if (num != -1) {
             pending_requests[numf].accepted = 1;
             sprintf(numchar, "\n[i] Added friendnumber: %d\n\n", num);
@@ -347,7 +349,7 @@ void line_eval(char* line)
 
         else if (inpt_command == 'a') {
             if (friend_request_received == 1)
-                accept_friend_request(line);
+                accept_friend_request();
         }
         /* EXIT */
         else if (inpt_command == 'q') {
@@ -373,7 +375,8 @@ int main(int argc, char *argv[])
         printf("[!] Usage: %s [IP] [port] [public_key] <nokey>\n", argv[0]);
         exit(0);
     }
-    if (initMessenger() == -1) {
+    messenger = initMessenger();
+    if (messenger == 0) {
         printf("initMessenger failed");
         exit(0);
     }
@@ -394,7 +397,7 @@ int main(int argc, char *argv[])
         while (fgets(line, MAX_NAME_LENGTH, name_file) != NULL) {
             sscanf(line, "%s", (char*)name);
         }
-        setname(name, strlen((char*)name)+1);
+        setname(messenger, name, strlen((char*)name)+1);
         nameloaded = 1;
         printf("%s\n", name);
         fclose(name_file);
@@ -407,16 +410,16 @@ int main(int argc, char *argv[])
         while (fgets(line, MAX_STATUSMESSAGE_LENGTH, status_file) != NULL) {
             sscanf(line, "%s", (char*)status);
         }
-        m_set_statusmessage(status, strlen((char*)status)+1);
+        m_set_statusmessage(messenger, status, strlen((char*)status)+1);
         statusloaded = 1;
         printf("%s\n", status);
         fclose(status_file);
     }
 
-    m_callback_friendrequest(print_request);
-    m_callback_friendmessage(print_message);
-    m_callback_namechange(print_nickchange);
-    m_callback_statusmessage(print_statuschange);
+    m_callback_friendrequest(messenger, print_request, &status_file);
+    m_callback_friendmessage(messenger, print_message, &status_file);
+    m_callback_namechange(messenger, print_nickchange, &status_file);
+    m_callback_statusmessage(messenger, print_statuschange, &status_file);
     char idstring1[PUB_KEY_BYTES][5];
     char idstring2[PUB_KEY_BYTES][5];
     int i;
@@ -474,7 +477,7 @@ int main(int argc, char *argv[])
             printf("\n---------------------------------\n\n");
             on = 1;
         }
-        doMessenger();
+        doMessenger(messenger);
         Sleep(1);
     }
     return 0;
diff --git a/testing/nTox_win32.h b/testing/nTox_win32.h
index 03641a5d..5dfe81c3 100644
--- a/testing/nTox_win32.h
+++ b/testing/nTox_win32.h
@@ -30,9 +30,10 @@
 #define PUB_KEY_BYTES 32
 
 void do_header();
-void print_message(int friendnumber, uint8_t * string, uint16_t length);
-void print_nickchange(int friendnumber, uint8_t *string, uint16_t length);
-void print_statuschange(int friendnumber, uint8_t *string, uint16_t length);
+void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata);
+void print_message(Messenger *messenger, int friendnumber, uint8_t * string, uint16_t length, void *userdata);
+void print_nickchange(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
+void print_statuschange(Messenger *messenger, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
 void load_key();
 void add_friend();
 void list_friends();
diff --git a/testing/rect.py b/testing/rect.py
deleted file mode 100644
index 05f0abc4..00000000
--- a/testing/rect.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#basic python UDP script
-#for testing only
-import socket
-import random
-
-UDP_IP = "127.0.0.1"
-UDP_PORT = 5004
-
-sock = socket.socket(socket.AF_INET, # Internet
-                     socket.SOCK_DGRAM) # UDP
-sock.bind((UDP_IP, UDP_PORT))
-
-#our client_id
-client_id = str(''.join(random.choice("abcdefghijklmnopqrstuvwxyz") for x in range(32)))
-
-print client_id
-a = 1;
-#send ping request to our DHT on localhost.
-sock.sendto("0012345678".decode("hex") + client_id, ('127.0.0.1', 33445))
-
-#print all packets received and respond to ping requests properly
-while True:
-    data, addr = sock.recvfrom(1024) # buffer size is 1024 bytes
-    print "received message:", data.encode('hex'), " From:", addr
-    #if we receive a ping request.
-    print data[0].encode('hex')
-    if data[0] == "00".decode('hex'):
-        print "Sending ping resp"
-        sock.sendto("01".decode('hex') + data[1:5] + client_id, addr)
-        
-    #if we receive a get_nodes request.
-    if data[0] == "02".decode('hex'):
-        print "Sending getn resp"
-        #send send nodes packet with a couple 127.0.0.1 ips and ports.
-        #127.0.0.1:5000, 127.0.0.1:5001, 127.0.0.1:5002
-        sock.sendto("03".decode('hex') + data[1:5] + client_id + ("HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH" + "7F00000113880000".decode('hex') + "HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH" + "7F00000113890000".decode('hex') + "HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH" + "7F000001138A0000".decode('hex')), addr)
-    
-    if data[0] == "10".decode('hex'):
-        print "Sending handshake resp"
-        sock.sendto("10".decode('hex') + data[1:5] + client_id[:4], addr)
-    if data[0] == "11".decode('hex'):
-        print "Sending SYNC resp"
-        a+=1
-        sock.sendto("11".decode('hex') + chr(a) + data[1:9], addr)
diff --git a/testing/toxic/dhtstatus.c b/testing/toxic/dhtstatus.c
index 66268900..e026a173 100644
--- a/testing/toxic/dhtstatus.c
+++ b/testing/toxic/dhtstatus.c
@@ -43,13 +43,13 @@ static void dhtstatus_onDraw(ToxWindow *self)
   uint32_t i, j;
   ipbuf ipbuf;
   wprintw(self->window,"\n%llu  ______________________ CLOSE LIST ________________________  ___ IP ADDR ___ _PRT_   LST   PNG    ____ SELF ____ _PRT_  LST\n\n", now);
-  for(i = 0; i < CLIENT_ID_SIZE; i++) {
+  for(i = 0; i < 32; i++) { /*Number of nodes in closelist*/
     Client_data * client = close_clientlist + i;
     if (i == num_selected) wattron(self->window, COLOR_PAIR(3));
     wprintw(self->window,"[%02i]  ", i);
     uint16_t port = ntohs(client->ip_port.port);
     if(port) {
-      for(j = 0; j < 32; j++)
+      for(j = 0; j < CLIENT_ID_SIZE; j++)
         wprintw(self->window, "%02hhx", client->client_id[j]);
           
       printip(ipbuf, client->ip_port.ip);