add configurable limit on number of stored frozen peers

1 files changed, 93 insertions, 7 deletions

diff --git a/toxcore/group.c b/toxcore/group.c
index 20ee5459..f6f8c704 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -118,6 +118,8 @@ static bool realloc_conferences(Group_Chats *g_c, uint16_t num)
 static void setup_conference(Group_c *g)
 {
     memset(g, 0, sizeof(Group_c));
+
+    g->maxfrozen = MAX_FROZEN_DEFAULT;
 }
 
 /* Create a new empty groupchat connection.
@@ -644,8 +646,8 @@ static int addpeer(Group_Chats *g_c, uint32_t groupnumber, const uint8_t *real_p
     id_copy(g->group[g->numpeers].temp_pk, temp_pk);
     g->group[g->numpeers].temp_pk_updated = true;
     g->group[g->numpeers].peer_number = peer_number;
-
     g->group[g->numpeers].last_active = mono_time_get(g_c->mono_time);
+    g->group[g->numpeers].is_friend = (getfriend_id(g_c->m, real_pk) != -1);
     ++g->numpeers;
 
     add_to_closest(g_c, groupnumber, real_pk, temp_pk);
@@ -752,6 +754,56 @@ static int delpeer(Group_Chats *g_c, uint32_t groupnumber, int peer_index, void
     return 0;
 }
 
+static int cmp_u64(uint64_t a, uint64_t b)
+{
+    return (a > b) - (a < b);
+}
+
+/* Order peers with friends first and with more recently active earlier */
+static int cmp_frozen(const void *a, const void *b)
+{
+    const Group_Peer *pa = (const Group_Peer *) a;
+    const Group_Peer *pb = (const Group_Peer *) b;
+
+    if (pa->is_friend ^ pb->is_friend) {
+        return pa->is_friend ? -1 : 1;
+    }
+
+    return cmp_u64(pb->last_active, pa->last_active);
+}
+
+/* Delete frozen peers as necessary to ensure at most g->maxfrozen remain.
+ *
+ * return true if any frozen peers are removed.
+ */
+static bool delete_old_frozen(Group_c *g)
+{
+    if (g->numfrozen <= g->maxfrozen) {
+        return false;
+    }
+
+    if (g->maxfrozen == 0) {
+        free(g->frozen);
+        g->frozen = nullptr;
+        g->numfrozen = 0;
+        return true;
+    }
+
+    qsort(g->frozen, g->numfrozen, sizeof(Group_Peer), cmp_frozen);
+
+    Group_Peer *temp = (Group_Peer *)realloc(g->frozen, sizeof(Group_Peer) * g->maxfrozen);
+
+    if (temp == nullptr) {
+        return false;
+    }
+
+    g->frozen = temp;
+
+    g->numfrozen = g->maxfrozen;
+
+    return true;
+}
+
 static bool try_send_rejoin(Group_Chats *g_c, uint32_t groupnumber, const uint8_t *real_pk);
 
 static int freeze_peer(Group_Chats *g_c, uint32_t groupnumber, int peer_index, void *userdata)
@@ -762,8 +814,6 @@ static int freeze_peer(Group_Chats *g_c, uint32_t groupnumber, int peer_index, v
         return -1;
     }
 
-    try_send_rejoin(g_c, groupnumber, g->group[peer_index].real_pk);
-
     Group_Peer *temp = (Group_Peer *)realloc(g->frozen, sizeof(Group_Peer) * (g->numfrozen + 1));
 
     if (temp == nullptr) {
@@ -773,9 +823,18 @@ static int freeze_peer(Group_Chats *g_c, uint32_t groupnumber, int peer_index, v
     g->frozen = temp;
     g->frozen[g->numfrozen] = g->group[peer_index];
     g->frozen[g->numfrozen].object = nullptr;
+
+    if (delpeer(g_c, groupnumber, peer_index, userdata, true) != 0) {
+        return -1;
+    }
+
+    try_send_rejoin(g_c, groupnumber, g->frozen[g->numfrozen].real_pk);
+
     ++g->numfrozen;
 
-    return delpeer(g_c, groupnumber, peer_index, userdata, true);
+    delete_old_frozen(g);
+
+    return 0;
 }
 
 
@@ -1236,6 +1295,24 @@ int group_frozen_last_active(const Group_Chats *g_c, uint32_t groupnumber, int p
     return 0;
 }
 
+/* Set maximum number of frozen peers.
+ *
+ * return 0 on success.
+ * return -1 if groupnumber is invalid.
+ */
+int group_set_max_frozen(const Group_Chats *g_c, uint32_t groupnumber, uint32_t maxfrozen)
+{
+    Group_c *g = get_group_c(g_c, groupnumber);
+
+    if (!g) {
+        return -1;
+    }
+
+    g->maxfrozen = maxfrozen;
+    delete_old_frozen(g);
+    return 0;
+}
+
 /* List all the (frozen, if frozen is true) peers in the group chat.
  *
  * Copies the names of the peers to the name[length][MAX_NAME_LENGTH] array.
@@ -3208,10 +3285,12 @@ static State_Load_Status load_conferences(Group_Chats *g_c, const uint8_t *data,
         lendian_bytes_to_host32(&g->numfrozen, data);
         data += sizeof(uint32_t);
 
-        g->frozen = (Group_Peer *)malloc(sizeof(Group_Peer) * g->numfrozen);
+        if (g->numfrozen > 0) {
+            g->frozen = (Group_Peer *)malloc(sizeof(Group_Peer) * g->numfrozen);
 
-        if (g->frozen == nullptr) {
-            return STATE_LOAD_STATUS_ERROR;
+            if (g->frozen == nullptr) {
+                return STATE_LOAD_STATUS_ERROR;
+            }
         }
 
         g->title_len = *data;
@@ -3252,6 +3331,13 @@ static State_Load_Status load_conferences(Group_Chats *g_c, const uint8_t *data,
 
             memcpy(peer->nick, data, peer->nick_len);
             data += peer->nick_len;
+
+            // NOTE: this relies on friends being loaded before conferences.
+            peer->is_friend = (getfriend_id(g_c->m, peer->real_pk) != -1);
+        }
+
+        if (g->numfrozen > g->maxfrozen) {
+            g->maxfrozen = g->numfrozen;
         }
 
         g->status = GROUPCHAT_STATUS_CONNECTED;