3 files changed, 33 insertions, 3 deletions

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