1 files changed, 42 insertions, 677 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 99b95f67..c3f85beb 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -153,20 +153,9 @@ void getaddress(const Messenger *m, uint8_t *address)
     memcpy(address + crypto_box_PUBLICKEYBYTES + sizeof(nospam), &checksum, sizeof(checksum));
 }
 
-/* callback for recv TCP relay nodes. */
-static int tcp_relay_node_callback(void *object, uint32_t number, IP_Port ip_port, const uint8_t *public_key)
-{
-    Messenger *m = object;
-
-    if (friend_not_valid(m, number))
-        return -1;
-
-    if (m->friendlist[number].crypt_connection_id != -1) {
-        return add_tcp_relay_peer(m->net_crypto, m->friendlist[number].crypt_connection_id, ip_port, public_key);
-    } else {
-        return add_tcp_relay(m->net_crypto, ip_port, public_key);
-    }
-}
+static int handle_status(void *object, int i, uint8_t status);
+static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len);
+static int handle_custom_lossy_packet(void *object, int friend_num, const uint8_t *packet, uint16_t length);
 
 /*
  * Add a friend.
@@ -230,18 +219,17 @@ int32_t m_addfriend(Messenger *m, const uint8_t *address, const uint8_t *data, u
 
     memset(&(m->friendlist[m->numfriends]), 0, sizeof(Friend));
 
-    int32_t onion_friendnum = onion_addfriend(m->onion_c, client_id);
+    int friendcon_id = new_friend_connection(m->fr_c, client_id);
 
-    if (onion_friendnum == -1)
-        return FAERR_UNKNOWN;
+    if (friendcon_id == -1)
+        return -1;
 
     uint32_t i;
 
     for (i = 0; i <= m->numfriends; ++i)  {
         if (m->friendlist[i].status == NOFRIEND) {
-            m->friendlist[i].onion_friendnum = onion_friendnum;
             m->friendlist[i].status = FRIEND_ADDED;
-            m->friendlist[i].crypt_connection_id = -1;
+            m->friendlist[i].friendcon_id = friendcon_id;
             m->friendlist[i].friendrequest_lastsent = 0;
             m->friendlist[i].friendrequest_timeout = FRIENDREQUEST_TIMEOUT;
             id_copy(m->friendlist[i].client_id, client_id);
@@ -258,7 +246,9 @@ int32_t m_addfriend(Messenger *m, const uint8_t *address, const uint8_t *data, u
             m->friendlist[i].message_id = 0;
             m->friendlist[i].receives_read_receipts = 1; /* Default: YES. */
             memcpy(&(m->friendlist[i].friendrequest_nospam), address + crypto_box_PUBLICKEYBYTES, sizeof(uint32_t));
-            recv_tcp_relay_handler(m->onion_c, onion_friendnum, &tcp_relay_node_callback, m, i);
+            friend_connection_callbacks(m->fr_c, friendcon_id, MESSENGER_CALLBACK_INDEX, &handle_status, &handle_packet,
+                                        &handle_custom_lossy_packet, m, i);
+
 
             if (m->numfriends == i)
                 ++m->numfriends;
@@ -287,18 +277,17 @@ int32_t m_addfriend_norequest(Messenger *m, const uint8_t *client_id)
 
     memset(&(m->friendlist[m->numfriends]), 0, sizeof(Friend));
 
-    int32_t onion_friendnum = onion_addfriend(m->onion_c, client_id);
+    int friendcon_id = new_friend_connection(m->fr_c, client_id);
 
-    if (onion_friendnum == -1)
+    if (friendcon_id == -1)
         return -1;
 
     uint32_t i;
 
     for (i = 0; i <= m->numfriends; ++i) {
         if (m->friendlist[i].status == NOFRIEND) {
-            m->friendlist[i].onion_friendnum = onion_friendnum;
             m->friendlist[i].status = FRIEND_CONFIRMED;
-            m->friendlist[i].crypt_connection_id = -1;
+            m->friendlist[i].friendcon_id = friendcon_id;
             m->friendlist[i].friendrequest_lastsent = 0;
             id_copy(m->friendlist[i].client_id, client_id);
             m->friendlist[i].statusmessage = calloc(1, 1);
@@ -311,7 +300,8 @@ int32_t m_addfriend_norequest(Messenger *m, const uint8_t *client_id)
             m->friendlist[i].is_typing = 0;
             m->friendlist[i].message_id = 0;
             m->friendlist[i].receives_read_receipts = 1; /* Default: YES. */
-            recv_tcp_relay_handler(m->onion_c, onion_friendnum, &tcp_relay_node_callback, m, i);
+            friend_connection_callbacks(m->fr_c, friendcon_id, MESSENGER_CALLBACK_INDEX, &handle_status, &handle_packet,
+                                        &handle_custom_lossy_packet, m, i);
 
             if (m->numfriends == i)
                 ++m->numfriends;
@@ -336,11 +326,11 @@ int m_delfriend(Messenger *m, int32_t friendnumber)
     if (m->friendlist[friendnumber].status == FRIEND_ONLINE)
         remove_online_friend(m, friendnumber);
 
-    onion_delfriend(m->onion_c, m->friendlist[friendnumber].onion_friendnum);
-    crypto_kill(m->net_crypto, m->friendlist[friendnumber].crypt_connection_id);
     free(m->friendlist[friendnumber].statusmessage);
     free(m->friendlist[friendnumber].avatar_recv_data);
     remove_request_received(&(m->fr), m->friendlist[friendnumber].client_id);
+    friend_connection_callbacks(m->fr_c, m->friendlist[friendnumber].friendcon_id, MESSENGER_CALLBACK_INDEX, 0, 0, 0, 0, 0);
+    kill_friend_connection(m->fr_c, m->friendlist[friendnumber].friendcon_id);
     memset(&(m->friendlist[friendnumber]), 0, sizeof(Friend));
     uint32_t i;
 
@@ -492,10 +482,6 @@ int setname(Messenger *m, const uint8_t *name, uint16_t length)
     for (i = 0; i < m->numfriends; ++i)
         m->friendlist[i].name_sent = 0;
 
-    for (i = 0; i < m->numchats; i++)
-        if (m->chats[i] != NULL)
-            set_nick(m->chats[i], name, length); /* TODO: remove this (group nicks should not be tied to the global one) */
-
     return 0;
 }
 
@@ -811,16 +797,6 @@ static int send_user_istyping(const Messenger *m, int32_t friendnumber, uint8_t
     return write_cryptpacket_id(m, friendnumber, PACKET_ID_TYPING, &typing, sizeof(typing), 0);
 }
 
-static int send_ping(const Messenger *m, int32_t friendnumber)
-{
-    int ret = write_cryptpacket_id(m, friendnumber, PACKET_ID_ALIVE, 0, 0, 0);
-
-    if (ret == 1)
-        m->friendlist[friendnumber].ping_lastsent = unix_time();
-
-    return ret;
-}
-
 static int send_relays(const Messenger *m, int32_t friendnumber)
 {
     Node_format nodes[MAX_SHARED_RELAYS];
@@ -967,8 +943,6 @@ static void check_friend_connectionstatus(Messenger *m, int32_t friendnumber, ui
     const uint8_t was_online = m->friendlist[friendnumber].status == FRIEND_ONLINE;
     const uint8_t is_online = status == FRIEND_ONLINE;
 
-    onion_set_friend_online(m->onion_c, m->friendlist[friendnumber].onion_friendnum, is_online);
-
     if (is_online != was_online) {
         if (was_online) {
             break_files(m, friendnumber);
@@ -1009,464 +983,31 @@ static int write_cryptpacket_id(const Messenger *m, int32_t friendnumber, uint8_
     if (length != 0)
         memcpy(packet + 1, data, length);
 
-    return write_cryptpacket(m->net_crypto, m->friendlist[friendnumber].crypt_connection_id, packet, length + 1,
-                             congestion_control) != -1;
+    return write_cryptpacket(m->net_crypto, friend_connection_crypt_connection_id(m->fr_c,
+                             m->friendlist[friendnumber].friendcon_id), packet, length + 1, congestion_control) != -1;
 }
 
 /**********GROUP CHATS************/
 
-/* return 1 if the groupnumber is not valid.
- * return 0 if the groupnumber is valid.
- */
-static uint8_t groupnumber_not_valid(const Messenger *m, int groupnumber)
-{
-    if ((unsigned int)groupnumber >= m->numchats)
-        return 1;
-
-    if (m->chats == NULL)
-        return 1;
-
-    if (m->chats[groupnumber] == NULL)
-        return 1;
-
-    return 0;
-}
-
-
-/* returns valid ip port of connected friend on success
- * returns zeroed out IP_Port on failure
- */
-static IP_Port get_friend_ipport(const Messenger *m, int32_t friendnumber)
-{
-    IP_Port zero;
-    memset(&zero, 0, sizeof(zero));
-
-    if (friend_not_valid(m, friendnumber))
-        return zero;
-
-    int crypt_id = m->friendlist[friendnumber].crypt_connection_id;
-
-    uint8_t direct_connected;
-
-    if (crypto_connection_status(m->net_crypto, crypt_id, &direct_connected) != CRYPTO_CONN_ESTABLISHED)
-        return zero;
-
-    if (direct_connected == 0)
-        return zero;
-
-    return m->net_crypto->crypto_connections[crypt_id].ip_port;
-}
-
-/* returns the group number of the chat with public key group_public_key.
- * returns -1 on failure.
- */
-static int group_num(const Messenger *m, const uint8_t *group_public_key)
-{
-    uint32_t i;
-
-    for (i = 0; i < m->numchats; ++i) {
-        if (m->chats[i] != NULL)
-            if (id_equal(m->chats[i]->self_public_key, group_public_key))
-                return i;
-    }
-
-    return -1;
-}
 
 /* Set the callback for group invites.
  *
- *  Function(Messenger *m, int32_t friendnumber, uint8_t *group_public_key, void *userdata)
+ *  Function(Messenger *m, int32_t friendnumber, uint8_t *data, uint16_t length)
  */
-void m_callback_group_invite(Messenger *m, void (*function)(Messenger *m, int32_t, const uint8_t *, void *),
-                             void *userdata)
+void m_callback_group_invite(Messenger *m, void (*function)(Messenger *m, int32_t, const uint8_t *, uint16_t))
 {
     m->group_invite = function;
-    m->group_invite_userdata = userdata;
 }
 
-/* Set the callback for group messages.
- *
- *  Function(Tox *tox, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
- */
-void m_callback_group_message(Messenger *m, void (*function)(Messenger *m, int, int, const uint8_t *, uint16_t, void *),
-                              void *userdata)
-{
-    m->group_message = function;
-    m->group_message_userdata = userdata;
-}
 
-/* Set the callback for group actions.
+/* Send a group invite packet.
  *
- *  Function(Tox *tox, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
- */
-void m_callback_group_action(Messenger *m, void (*function)(Messenger *m, int, int, const uint8_t *, uint16_t, void *),
-                             void *userdata)
-{
-    m->group_action = function;
-    m->group_action_userdata = userdata;
-}
-
-/* Set callback function for peer name list changes.
- *
- * It gets called every time the name list changes(new peer/name, deleted peer)
- *  Function(Tox *tox, int groupnumber, void *userdata)
- */
-void m_callback_group_namelistchange(Messenger *m, void (*function)(Messenger *m, int, int, uint8_t, void *),
-                                     void *userdata)
-{
-    m->group_namelistchange = function;
-    m->group_namelistchange_userdata = userdata;
-}
-
-static int get_chat_num(const Messenger *m, const Group_Chat *chat)
-{
-    uint32_t i;
-
-    for (i = 0; i < m->numchats; ++i) { //TODO: remove this
-        if (m->chats[i] == chat)
-            return i;
-    }
-
-    return -1;
-}
-
-static void group_message_function(Group_Chat *chat, int peer_number, const uint8_t *message, uint16_t length,
-                                   void *userdata)
-{
-    Messenger *m = userdata;
-    int i = get_chat_num(m, chat);
-
-    if (i == -1)
-        return;
-
-    uint8_t message_terminated[length + 1];
-    memcpy(message_terminated, message, length);
-    message_terminated[length] = 0; /* Force NULL terminator */
-
-    if (m->group_message)
-        (*m->group_message)(m, i, peer_number, message_terminated, length, m->group_message_userdata);
-}
-
-static void group_action_function(Group_Chat *chat, int peer_number, const uint8_t *action, uint16_t length,
-                                  void *userdata)
-{
-    Messenger *m = userdata;
-    int i = get_chat_num(m, chat);
-
-    if (i == -1)
-        return;
-
-    uint8_t action_terminated[length + 1];
-    memcpy(action_terminated, action, length);
-    action_terminated[length] = 0; /* Force NULL terminator */
-
-    if (m->group_action)
-        (*m->group_action)(m, i, peer_number, action_terminated, length, m->group_action_userdata);
-}
-
-static void group_namelistchange_function(Group_Chat *chat, int peer, uint8_t change, void *userdata)
-{
-    Messenger *m = userdata;
-    int i = get_chat_num(m, chat);
-
-    if (i == -1)
-        return;
-
-    if (m->group_namelistchange)
-        (*m->group_namelistchange)(m, i, peer, change, m->group_namelistchange_userdata);
-}
-
-
-/* Creates a new groupchat and puts it in the chats array.
- *
- * return group number on success.
- * return -1 on failure.
- */
-int add_groupchat(Messenger *m)
-{
-    uint32_t i;
-
-    for (i = 0; i < m->numchats; ++i) {
-        if (m->chats[i] == NULL) {
-            Group_Chat *newchat = new_groupchat(m->net);
-
-            if (newchat == NULL)
-                return -1;
-
-            callback_groupmessage(newchat, &group_message_function, m);
-            callback_groupaction(newchat, &group_action_function, m);
-            callback_namelistchange(newchat, &group_namelistchange_function, m);
-            /* TODO: remove this (group nicks should not be tied to the global one) */
-            set_nick(newchat, m->name, m->name_length);
-            m->chats[i] = newchat;
-            return i;
-        }
-    }
-
-    Group_Chat **temp;
-    temp = realloc(m->chats, sizeof(Group_Chat *) * (m->numchats + 1));
-
-    if (temp == NULL)
-        return -1;
-
-    m->chats = temp;
-    temp[m->numchats] = new_groupchat(m->net);
-
-    if (temp[m->numchats] == NULL)
-        return -1;
-
-    callback_groupmessage(temp[m->numchats], &group_message_function, m);
-    callback_groupaction(temp[m->numchats], &group_action_function, m);
-    callback_namelistchange(temp[m->numchats], &group_namelistchange_function, m);
-    /* TODO: remove this (group nicks should not be tied to the global one) */
-    set_nick(temp[m->numchats], m->name, m->name_length);
-    ++m->numchats;
-    return (m->numchats - 1);
-}
-
-/* Delete a groupchat from the chats array.
- *
- * return 0 on success.
- * return -1 if failure.
- */
-int del_groupchat(Messenger *m, int groupnumber)
-{
-    if ((unsigned int)groupnumber >= m->numchats)
-        return -1;
-
-    if (m->chats == NULL)
-        return -1;
-
-    if (m->chats[groupnumber] == NULL)
-        return -1;
-
-    kill_groupchat(m->chats[groupnumber]);
-    m->chats[groupnumber] = NULL;
-
-    uint32_t i;
-
-    for (i = m->numchats; i != 0; --i) {
-        if (m->chats[i - 1] != NULL)
-            break;
-    }
-
-    m->numchats = i;
-
-    if (i == 0) {
-        free(m->chats);
-        m->chats = NULL;
-    } else {
-        Group_Chat **temp = realloc(m->chats, sizeof(Group_Chat *) * i);
-
-        if (temp != NULL)
-            m->chats = temp;
-    }
-
-    return 0;
-}
-
-/* Copy the name of peernumber who is in groupnumber to name.
- * name must be at least MAX_NICK_BYTES long.
- *
- * return length of name if success
- * return -1 if failure
- */
-int m_group_peername(const Messenger *m, int groupnumber, int peernumber, uint8_t *name)
-{
-    if ((unsigned int)groupnumber >= m->numchats)
-        return -1;
-
-    if (m->chats == NULL)
-        return -1;
-
-    if (m->chats[groupnumber] == NULL)
-        return -1;
-
-    return group_peername(m->chats[groupnumber], peernumber, name);
-}
-
-/* Store the fact that we invited a specific friend.
- */
-static void group_store_friendinvite(Messenger *m, int32_t friendnumber, int groupnumber)
-{
-    /* Add 1 to the groupchat number because 0 (default value in invited_groups) is a valid groupchat number */
-    m->friendlist[friendnumber].invited_groups[m->friendlist[friendnumber].invited_groups_num % MAX_INVITED_GROUPS] =
-        groupnumber + 1;
-    ++m->friendlist[friendnumber].invited_groups_num;
-}
-
-/* return 1 if that friend was invited to the group
- * return 0 if the friend was not or error.
- */
-static uint8_t group_invited(const Messenger *m, int32_t friendnumber, int groupnumber)
-{
-
-    uint32_t i;
-    uint16_t num = MAX_INVITED_GROUPS;
-
-    if (MAX_INVITED_GROUPS > m->friendlist[friendnumber].invited_groups_num)
-        num = m->friendlist[friendnumber].invited_groups_num;
-
-    for (i = 0; i < num; ++i) {
-        if (m->friendlist[friendnumber].invited_groups[i] == groupnumber + 1) {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-/* invite friendnumber to groupnumber
- * return 0 on success
- * return -1 on failure
- */
-int invite_friend(Messenger *m, int32_t friendnumber, int groupnumber)
-{
-    if (friend_not_valid(m, friendnumber) || (unsigned int)groupnumber >= m->numchats)
-        return -1;
-
-    if (m->chats == NULL)
-        return -1;
-
-    if (m->friendlist[friendnumber].status == NOFRIEND || m->chats[groupnumber] == NULL)
-        return -1;
-
-    group_store_friendinvite(m, friendnumber, groupnumber);
-
-    if (write_cryptpacket_id(m, friendnumber, PACKET_ID_INVITE_GROUPCHAT, m->chats[groupnumber]->self_public_key,
-                             crypto_box_PUBLICKEYBYTES, 0) == 0)
-        return -1;
-
-    return 0;
-}
-
-
-/* Join a group (you need to have been invited first.)
- *
- * returns group number on success
- * returns -1 on failure.
- */
-int join_groupchat(Messenger *m, int32_t friendnumber, const uint8_t *friend_group_public_key)
-{
-    if (friend_not_valid(m, friendnumber))
-        return -1;
-
-    uint8_t data[crypto_box_PUBLICKEYBYTES * 2];
-    int groupnum = add_groupchat(m);
-
-    if (groupnum == -1)
-        return -1;
-
-    IP_Port friend_ip = get_friend_ipport(m, friendnumber);
-
-    if (friend_ip.ip.family == 0) {
-        del_groupchat(m, groupnum);
-        return -1;
-    }
-
-    id_copy(data, friend_group_public_key);
-    id_copy(data + crypto_box_PUBLICKEYBYTES, m->chats[groupnum]->self_public_key);
-
-    if (write_cryptpacket_id(m, friendnumber, PACKET_ID_JOIN_GROUPCHAT, data, sizeof(data), 0)) {
-        chat_bootstrap_nonlazy(m->chats[groupnum], get_friend_ipport(m, friendnumber),
-                               friend_group_public_key); //TODO: check if ip returned is zero?
-        return groupnum;
-    }
-
-    del_groupchat(m, groupnum);
-    return -1;
-}
-
-
-/* send a group message
- * return 0 on success
- * return -1 on failure
- */
-int group_message_send(const Messenger *m, int groupnumber, const uint8_t *message, uint32_t length)
-{
-    if (groupnumber_not_valid(m, groupnumber))
-        return -1;
-
-    if (group_sendmessage(m->chats[groupnumber], message, length) > 0)
-        return 0;
-
-    return -1;
-}
-
-/* send a group action
- * return 0 on success
- * return -1 on failure
- */
-int group_action_send(const Messenger *m, int groupnumber, const uint8_t *action, uint32_t length)
-{
-    if (groupnumber_not_valid(m, groupnumber))
-        return -1;
-
-    if (group_sendaction(m->chats[groupnumber], action, length) > 0)
-        return 0;
-
-    return -1;
-}
-
-/* Return the number of peers in the group chat on success.
- * return -1 on failure
- */
-int group_number_peers(const Messenger *m, int groupnumber)
-{
-    if (groupnumber_not_valid(m, groupnumber))
-        return -1;
-
-    return group_numpeers(m->chats[groupnumber]);
-}
-
-/* List all the peers in the group chat.
- *
- * Copies the names of the peers to the name[length][MAX_NICK_BYTES] array.
- *
- * Copies the lengths of the names to lengths[length]
- *
- * returns the number of peers on success.
- *
- * return -1 on failure.
+ *  return 1 on success
+ *  return 0 on failure
  */
-int group_names(const Messenger *m, int groupnumber, uint8_t names[][MAX_NICK_BYTES], uint16_t lengths[],
-                uint16_t length)
+int send_group_invite_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data, uint16_t length)
 {
-    if (groupnumber_not_valid(m, groupnumber))
-        return -1;
-
-    return group_client_names(m->chats[groupnumber], names, lengths, length);
-}
-
-static int handle_group(void *object, IP_Port source, const uint8_t *packet, uint32_t length)
-{
-    Messenger *m = object;
-
-    if (length < crypto_box_PUBLICKEYBYTES + 1) {
-        return 1;
-    }
-
-    uint32_t i;
-
-    for (i = 0; i < m->numchats; ++i) {
-        if (m->chats[i] == NULL)
-            continue;
-
-        if (id_equal(packet + 1, m->chats[i]->self_public_key))
-            return handle_groupchatpacket(m->chats[i], source, packet, length);
-    }
-
-    return 1;
-}
-
-static void do_allgroupchats(Messenger *m)
-{
-    uint32_t i;
-
-    for (i = 0; i < m->numchats; ++i) {
-        if (m->chats[i] != NULL)
-            do_groupchat(m->chats[i]);
-    }
+    return write_cryptpacket_id(m, friendnumber, PACKET_ID_INVITE_GROUPCHAT, data, length, 0);
 }
 
 /****************FILE SENDING*****************/
@@ -1669,8 +1210,9 @@ int file_data(const Messenger *m, int32_t friendnumber, uint8_t filenumber, cons
     if (m->friendlist[friendnumber].file_sending[filenumber].status != FILESTATUS_TRANSFERRING)
         return -1;
 
-    /* Prevent file sending from filling up the entire buffer preventing messages from being sent. */
-    if (crypto_num_free_sendqueue_slots(m->net_crypto, m->friendlist[friendnumber].crypt_connection_id) < MIN_SLOTS_FREE)
+    /* Prevent file sending from filling up the entire buffer preventing messages from being sent. TODO: remove */
+    if (crypto_num_free_sendqueue_slots(m->net_crypto, friend_connection_crypt_connection_id(m->fr_c,
+                                        m->friendlist[friendnumber].friendcon_id)) < MIN_SLOTS_FREE)
         return -1;
 
     uint8_t packet[MAX_CRYPTO_DATA_SIZE];
@@ -1876,10 +1418,8 @@ int send_custom_lossy_packet(const Messenger *m, int32_t friendnumber, const uin
     if (m->friendlist[friendnumber].status != FRIEND_ONLINE)
         return -1;
 
-    if (m->friendlist[friendnumber].crypt_connection_id == -1)
-        return -1;
-
-    return send_lossy_cryptpacket(m->net_crypto, m->friendlist[friendnumber].crypt_connection_id, data, length);
+    return send_lossy_cryptpacket(m->net_crypto, friend_connection_crypt_connection_id(m->fr_c,
+                                  m->friendlist[friendnumber].friendcon_id), data, length);
 }
 
 static int handle_custom_lossless_packet(void *object, int friend_num, const uint8_t *packet, uint16_t length)
@@ -1937,10 +1477,8 @@ int send_custom_lossless_packet(const Messenger *m, int32_t friendnumber, const
     if (m->friendlist[friendnumber].status != FRIEND_ONLINE)
         return -1;
 
-    if (m->friendlist[friendnumber].crypt_connection_id == -1)
-        return -1;
-
-    if (write_cryptpacket(m->net_crypto, m->friendlist[friendnumber].crypt_connection_id, data, length, 1) == -1) {
+    if (write_cryptpacket(m->net_crypto, friend_connection_crypt_connection_id(m->fr_c,
+                          m->friendlist[friendnumber].friendcon_id), data, length, 1) == -1) {
         return -1;
     } else {
         return 0;
@@ -1967,31 +1505,6 @@ static void LANdiscovery(Messenger *m)
     }
 }
 
-static int handle_status(void *object, int i, uint8_t status);
-static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len);
-
-static int handle_new_connections(void *object, New_Connection *n_c)
-{
-    Messenger *m = object;
-    int friend_id = getfriend_id(m, n_c->public_key);
-
-    if (friend_id != -1) {
-        if (m->friendlist[friend_id].crypt_connection_id != -1)
-            return -1;
-
-        int id = accept_crypto_connection(m->net_crypto, n_c);
-        connection_status_handler(m->net_crypto, id, &handle_status, m, friend_id);
-        connection_data_handler(m->net_crypto, id, &handle_packet, m, friend_id);
-        connection_lossy_data_handler(m->net_crypto, id, &handle_custom_lossy_packet, m, friend_id);
-        m->friendlist[friend_id].crypt_connection_id = id;
-        set_friend_status(m, friend_id, FRIEND_CONFIRMED);
-        return 0;
-    }
-
-    return -1;
-}
-
-
 /* Run this at startup. */
 Messenger *new_messenger(Messenger_Options *options)
 {
@@ -2038,13 +1551,13 @@ Messenger *new_messenger(Messenger_Options *options)
         return NULL;
     }
 
-    new_connection_handler(m->net_crypto, &handle_new_connections, m);
-
     m->onion = new_onion(m->dht);
     m->onion_a = new_onion_announce(m->dht);
     m->onion_c =  new_onion_client(m->net_crypto);
+    m->fr_c = new_friend_connections(m->onion_c);
 
     if (!(m->onion && m->onion_a && m->onion_c)) {
+        kill_friend_connections(m->fr_c);
         kill_onion(m->onion);
         kill_onion_announce(m->onion_a);
         kill_onion_client(m->onion_c);
@@ -2061,22 +1574,15 @@ Messenger *new_messenger(Messenger_Options *options)
     set_nospam(&(m->fr), random_int());
     set_filter_function(&(m->fr), &friend_already_added, m);
 
-    networking_registerhandler(m->net, NET_PACKET_GROUP_CHATS, &handle_group, m);
-
     return m;
 }
 
 /* Run this before closing shop. */
 void kill_messenger(Messenger *m)
 {
-    /* FIXME TODO: ideally cleanupMessenger will mirror initMessenger.
-     * This requires the other modules to expose cleanup functions.
-     */
-    uint32_t i, numchats = m->numchats;
-
-    for (i = 0; i < numchats; ++i)
-        del_groupchat(m, i);
+    uint32_t i;
 
+    kill_friend_connections(m->fr_c);
     kill_onion(m->onion);
     kill_onion_announce(m->onion_a);
     kill_onion_client(m->onion_c);
@@ -2124,8 +1630,6 @@ static int handle_status(void *object, int i, uint8_t status)
         m->friendlist[i].statusmessage_sent = 0;
         m->friendlist[i].ping_lastrecv = temp_time;
     } else { /* Went offline. */
-        m->friendlist[i].crypt_connection_id = -1;
-
         if (m->friendlist[i].status == FRIEND_ONLINE) {
             set_friend_status(m, i, FRIEND_CONFIRMED);
         }
@@ -2425,11 +1929,6 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len)
         return -1;
 
     switch (packet_id) {
-        case PACKET_ID_ALIVE: {
-            m->friendlist[i].ping_lastrecv = temp_time;
-            break;
-        }
-
         case PACKET_ID_NICKNAME: {
             if (data_length > MAX_NAME_LENGTH || data_length == 0)
                 break;
@@ -2599,33 +2098,15 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len)
         }
 
         case PACKET_ID_INVITE_GROUPCHAT: {
-            if (data_length != crypto_box_PUBLICKEYBYTES)
+            if (data_length == 0)
                 break;
 
             if (m->group_invite)
-                (*m->group_invite)(m, i, data, m->group_invite_userdata);
+                (*m->group_invite)(m, i, data, data_length);
 
             break;
         }
 
-        case PACKET_ID_JOIN_GROUPCHAT: {
-            if (data_length != crypto_box_PUBLICKEYBYTES * 2)
-                break;
-
-            int groupnum = group_num(m, data);
-
-            if (groupnum == -1)
-                break;
-
-            if (!group_invited(m, i, groupnum))
-                break;
-
-            group_newpeer(m->chats[groupnum], data + crypto_box_PUBLICKEYBYTES);
-            /* This is just there to speedup joining. */
-            chat_bootstrap(m->chats[groupnum], get_friend_ipport(m, i), data + crypto_box_PUBLICKEYBYTES);
-            break;
-        }
-
         case PACKET_ID_FILE_SENDREQUEST: {
             if (data_length < 1 + sizeof(uint64_t) + 1)
                 break;
@@ -2720,27 +2201,6 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len)
     return 0;
 }
 
-static int friend_new_connection(Messenger *m, int32_t friendnumber, const uint8_t *real_public_key)
-{
-    if (friend_not_valid(m, friendnumber))
-        return -1;
-
-    if (m->friendlist[friendnumber].crypt_connection_id != -1) {
-        return -1;
-    }
-
-    int id = new_crypto_connection(m->net_crypto, real_public_key);
-
-    if (id == -1)
-        return -1;
-
-    m->friendlist[friendnumber].crypt_connection_id = id;
-    connection_status_handler(m->net_crypto, id, &handle_status, m, friendnumber);
-    connection_data_handler(m->net_crypto, id, &handle_packet, m, friendnumber);
-    connection_lossy_data_handler(m->net_crypto, id, &handle_custom_lossy_packet, m, friendnumber);
-    return 0;
-}
-
 /* TODO: Make this function not suck. */
 void do_friends(Messenger *m)
 {
@@ -2767,32 +2227,6 @@ void do_friends(Messenger *m)
                  */
                 check_friend_request_timed_out(m, i, temp_time);
             }
-
-            friend_new_connection(m, i, m->friendlist[i].client_id);
-        }
-
-        if (m->friendlist[i].crypt_connection_id != -1) {
-            uint8_t dht_public_key1[crypto_box_PUBLICKEYBYTES];
-            uint64_t timestamp1 = onion_getfriend_DHT_pubkey(m->onion_c, m->friendlist[i].onion_friendnum, dht_public_key1);
-            uint8_t dht_public_key2[crypto_box_PUBLICKEYBYTES];
-            uint64_t timestamp2 = get_connection_dht_key(m->net_crypto, m->friendlist[i].crypt_connection_id, dht_public_key2);
-
-            if (timestamp1 > timestamp2) {
-                set_connection_dht_public_key(m->net_crypto, m->friendlist[i].crypt_connection_id, dht_public_key1, timestamp1);
-            } else if (timestamp1 < timestamp2) {
-                onion_set_friend_DHT_pubkey(m->onion_c, m->friendlist[i].onion_friendnum, dht_public_key2, timestamp2);
-            }
-
-            uint8_t direct_connected;
-            unsigned int status = crypto_connection_status(m->net_crypto, m->friendlist[i].crypt_connection_id, &direct_connected);
-
-            if (direct_connected == 0 || status == CRYPTO_CONN_COOKIE_REQUESTING) {
-                IP_Port friendip;
-
-                if (onion_getfriendip(m->onion_c, m->friendlist[i].onion_friendnum, &friendip) == 1) {
-                    set_direct_ip_port(m->net_crypto, m->friendlist[i].crypt_connection_id, friendip);
-                }
-            }
         }
 
         if (m->friendlist[i].status == FRIEND_ONLINE) { /* friend is online. */
@@ -2821,17 +2255,6 @@ void do_friends(Messenger *m)
                     m->friendlist[i].user_istyping_sent = 1;
             }
 
-            if (m->friendlist[i].ping_lastsent + FRIEND_PING_INTERVAL < temp_time) {
-                send_ping(m, i);
-            }
-
-            if (m->friendlist[i].ping_lastrecv + FRIEND_CONNECTION_TIMEOUT < temp_time) {
-                /* If we stopped receiving ping packets, kill it. */
-                crypto_kill(m->net_crypto, m->friendlist[i].crypt_connection_id);
-                m->friendlist[i].crypt_connection_id = -1;
-                set_friend_status(m, i, FRIEND_CONFIRMED);
-            }
-
             if (m->friendlist[i].share_relays_lastsent + FRIEND_SHARE_RELAYS_INTERVAL < temp_time) {
                 send_relays(m, i);
             }
@@ -2901,8 +2324,8 @@ void do_messenger(Messenger *m)
 
     do_net_crypto(m->net_crypto);
     do_onion_client(m->onion_c);
+    do_friend_connections(m->fr_c);
     do_friends(m);
-    do_allgroupchats(m);
     LANdiscovery(m);
 
 #ifdef LOGGING
@@ -2913,16 +2336,6 @@ void do_messenger(Messenger *m)
         Assoc_status(m->dht->assoc);
 #endif
 
-        if (m->numchats > 0) {
-            size_t c;
-
-            for (c = 0; c < m->numchats; c++) {
-                if (m->chats[c])
-                    Assoc_status(m->chats[c]->assoc);
-            }
-        }
-
-
         lastdump = unix_time();
         uint32_t client, last_pinged;
 
@@ -2992,8 +2405,8 @@ void do_messenger(Messenger *m)
                 if (ping_lastrecv > 999)
                     ping_lastrecv = 999;
 
-                LOGGER_INFO("F[%2u:%2u] <%s> %02i [%03u] %s",
-                            dht2m[friend], friend, msgfptr->name, msgfptr->crypt_connection_id,
+                LOGGER_INFO("F[%2u:%2u] <%s> [%03u] %s",
+                            dht2m[friend], friend, msgfptr->name,
                             ping_lastrecv, ID2String(msgfptr->client_id));
             } else {
                 LOGGER_INFO("F[--:%2u] %s", friend, ID2String(dhtfptr->client_id));
@@ -3429,51 +2842,3 @@ int get_friendlist(const Messenger *m, int32_t **out_list, uint32_t *out_list_le
 
     return 0;
 }
-
-/* Return the number of chats in the instance m.
- * You should use this to determine how much memory to allocate
- * for copy_chatlist. */
-uint32_t count_chatlist(const Messenger *m)
-{
-    uint32_t ret = 0;
-    uint32_t i;
-
-    for (i = 0; i < m->numchats; i++) {
-        if (m->chats[i]) {
-            ret++;
-        }
-    }
-
-    return ret;
-}
-
-/* Copy a list of valid chat IDs into the array out_list.
- * If out_list is NULL, returns 0.
- * Otherwise, returns the number of elements copied.
- * If the array was too small, the contents
- * of out_list will be truncated to list_size. */
-uint32_t copy_chatlist(const Messenger *m, int *out_list, uint32_t list_size)
-{
-    if (!out_list)
-        return 0;
-
-    if (m->numchats == 0) {
-        return 0;
-    }
-
-    uint32_t i;
-    uint32_t ret = 0;
-
-    for (i = 0; i < m->numchats; i++) {
-        if (ret >= list_size) {
-            break; /* Abandon ship */
-        }
-
-        if (m->chats[i]) {
-            out_list[ret] = i;
-            ret++;
-        }
-    }
-
-    return ret;
-}