3 files changed, 95 insertions, 85 deletions

diff --git a/.travis/cmake-linux b/.travis/cmake-linux
index e5874c19..48b72925 100755
--- a/.travis/cmake-linux
+++ b/.travis/cmake-linux
@@ -48,6 +48,8 @@ travis_script() {
   # Coverage flags.
   add_flag -fprofile-arcs -ftest-coverage
 
+  other/astyle/format-source . "$ASTYLE"
+
   cmake -B_build -H. \
     -DCMAKE_C_FLAGS="$C_FLAGS" \
     -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
@@ -65,8 +67,6 @@ travis_script() {
   make "-j$NPROC" test ARGS="-j50" || \
     make "-j$NPROC" test ARGS="-j50 --rerun-failed" CTEST_OUTPUT_ON_FAILURE=1
   cd -  # popd
-
-  other/astyle/format-source . "$ASTYLE"
 }
 
 if [ "-z" "$ACTION" ]; then
diff --git a/toxcore/group.c b/toxcore/group.c
index 4942d872..a2ebca16 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -221,11 +221,11 @@ static uint64_t calculate_comp_value(const uint8_t *pk1, const uint8_t *pk2)
     return (cmp1 - cmp2);
 }
 
-enum {
+typedef enum Groupchat_Closest {
     GROUPCHAT_CLOSEST_NONE,
     GROUPCHAT_CLOSEST_ADDED,
     GROUPCHAT_CLOSEST_REMOVED
-};
+} Groupchat_Closest;
 
 static int friend_in_close(Group_c *g, int friendcon_id);
 static int add_conn_to_groupchat(Group_Chats *g_c, int friendcon_id, uint32_t groupnumber, uint8_t closest,
@@ -1114,9 +1114,7 @@ int join_groupchat(Group_Chats *g_c, uint32_t friendnumber, uint8_t expected_typ
  *
  * Function(void *group object (set with group_set_object), uint32_t groupnumber, uint32_t friendgroupnumber, void *group peer object (set with group_peer_set_object), const uint8_t *packet, uint16_t length)
  */
-void group_lossy_packet_registerhandler(Group_Chats *g_c, uint8_t byte, int (*function)(void *, uint32_t, uint32_t,
-                                        void *,
-                                        const uint8_t *, uint16_t))
+void group_lossy_packet_registerhandler(Group_Chats *g_c, uint8_t byte, lossy_packet_cb *function)
 {
     g_c->lossy_packethandlers[byte].function = function;
 }
@@ -1127,8 +1125,7 @@ void group_lossy_packet_registerhandler(Group_Chats *g_c, uint8_t byte, int (*fu
  *
  *  data of length is what needs to be passed to join_groupchat().
  */
-void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, int, const uint8_t *,
-                             size_t, void *))
+void g_callback_group_invite(Group_Chats *g_c, g_conference_invite_cb *function)
 {
     g_c->invite_callback = function;
 }
@@ -1138,8 +1135,7 @@ void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, ui
  *
  *  Function(Group_Chats *g_c, uint32_t groupnumber, uint32_t friendgroupnumber, uint8_t * message, size_t length, void *userdata)
  */
-void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *,
-                              size_t, void *))
+void g_callback_group_message(Group_Chats *g_c, g_conference_message_cb *function)
 {
     g_c->message_callback = function;
 }
@@ -1149,8 +1145,7 @@ void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, u
  * It gets called every time a peer changes their nickname.
  *  Function(Group_Chats *g_c, uint32_t groupnumber, uint32_t peernumber, const uint8_t *nick, size_t nick_len, void *userdata)
  */
-void g_callback_peer_name(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, const uint8_t *,
-                          size_t, void *))
+void g_callback_peer_name(Group_Chats *g_c, peer_name_cb *function)
 {
     g_c->peer_name_callback = function;
 }
@@ -1160,7 +1155,7 @@ void g_callback_peer_name(Group_Chats *g_c, void (*function)(Messenger *m, uint3
  * It gets called every time the name list changes(new peer, deleted peer)
  *  Function(Group_Chats *g_c, uint32_t groupnumber, void *userdata)
  */
-void g_callback_peer_list_changed(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, void *))
+void g_callback_peer_list_changed(Group_Chats *g_c, peer_list_changed_cb *function)
 {
     g_c->peer_list_changed_callback = function;
 }
@@ -1171,8 +1166,7 @@ void g_callback_peer_list_changed(Group_Chats *g_c, void (*function)(Messenger *
  * Function(Group_Chats *g_c, int groupnumber, int friendgroupnumber, uint8_t * title, uint8_t length, void *userdata)
  * if friendgroupnumber == -1, then author is unknown (e.g. initial joining the group)
  */
-void g_callback_group_title(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, const uint8_t *,
-                            size_t, void *))
+void g_callback_group_title(Group_Chats *g_c, title_cb *function)
 {
     g_c->title_callback = function;
 }
@@ -1184,8 +1178,7 @@ void g_callback_group_title(Group_Chats *g_c, void (*function)(Messenger *m, uin
  * return 0 on success.
  * return -1 on failure.
  */
-int callback_groupchat_peer_new(const Group_Chats *g_c, uint32_t groupnumber, void (*function)(void *, uint32_t,
-                                uint32_t))
+int callback_groupchat_peer_new(const Group_Chats *g_c, uint32_t groupnumber, peer_on_join_cb *function)
 {
     Group_c *g = get_group_c(g_c, groupnumber);
 
@@ -1204,7 +1197,7 @@ int callback_groupchat_peer_new(const Group_Chats *g_c, uint32_t groupnumber, vo
  * return 0 on success.
  * return -1 on failure.
  */
-int callback_groupchat_peer_delete(Group_Chats *g_c, uint32_t groupnumber, void (*function)(void *, uint32_t, void *))
+int callback_groupchat_peer_delete(Group_Chats *g_c, uint32_t groupnumber, peer_on_leave_cb *function)
 {
     Group_c *g = get_group_c(g_c, groupnumber);
 
@@ -1223,7 +1216,7 @@ int callback_groupchat_peer_delete(Group_Chats *g_c, uint32_t groupnumber, void
  * return 0 on success.
  * return -1 on failure.
  */
-int callback_groupchat_delete(Group_Chats *g_c, uint32_t groupnumber, void (*function)(void *, uint32_t))
+int callback_groupchat_delete(Group_Chats *g_c, uint32_t groupnumber, group_on_delete_cb *function)
 {
     Group_c *g = get_group_c(g_c, groupnumber);
 
@@ -1414,7 +1407,7 @@ static void handle_friend_invite_packet(Messenger *m, uint32_t friendnumber, con
 
             if (groupnumber == -1) {
                 if (g_c->invite_callback) {
-                    g_c->invite_callback(m, friendnumber, *(invite_data + sizeof(uint16_t)), invite_data, invite_length, userdata);
+                    g_c->invite_callback(m, friendnumber, invite_data[sizeof(uint16_t)], invite_data, invite_length, userdata);
                 }
 
                 return;
@@ -1631,22 +1624,24 @@ static unsigned int send_peers(Group_Chats *g_c, uint32_t groupnumber, int frien
         return 0;
     }
 
-    uint8_t packet[MAX_CRYPTO_DATA_SIZE - (1 + sizeof(uint16_t))];
-    packet[0] = PEER_RESPONSE_ID;
-    uint8_t *p = packet + 1;
+    uint8_t response_packet[MAX_CRYPTO_DATA_SIZE - (1 + sizeof(uint16_t))];
+    response_packet[0] = PEER_RESPONSE_ID;
+    uint8_t *p = response_packet + 1;
 
     uint16_t sent = 0;
     unsigned int i;
 
     for (i = 0; i < g->numpeers; ++i) {
-        if ((p - packet) + sizeof(uint16_t) + CRYPTO_PUBLIC_KEY_SIZE * 2 + 1 + g->group[i].nick_len > sizeof(packet)) {
-            if (send_packet_group_peer(g_c->fr_c, friendcon_id, PACKET_ID_DIRECT_CONFERENCE, group_num, packet, (p - packet))) {
+        if ((p - response_packet) + sizeof(uint16_t) + CRYPTO_PUBLIC_KEY_SIZE * 2 + 1 + g->group[i].nick_len > sizeof(
+                    response_packet)) {
+            if (send_packet_group_peer(g_c->fr_c, friendcon_id, PACKET_ID_DIRECT_CONFERENCE, group_num, response_packet,
+                                       (p - response_packet))) {
                 sent = i;
             } else {
                 return sent;
             }
 
-            p = packet + 1;
+            p = response_packet + 1;
         }
 
         uint16_t peer_num = net_htons(g->group[i].peer_number);
@@ -1663,16 +1658,18 @@ static unsigned int send_peers(Group_Chats *g_c, uint32_t groupnumber, int frien
     }
 
     if (sent != i) {
-        if (send_packet_group_peer(g_c->fr_c, friendcon_id, PACKET_ID_DIRECT_CONFERENCE, group_num, packet, (p - packet))) {
+        if (send_packet_group_peer(g_c->fr_c, friendcon_id, PACKET_ID_DIRECT_CONFERENCE, group_num, response_packet,
+                                   (p - response_packet))) {
             sent = i;
         }
     }
 
     if (g->title_len) {
-        VLA(uint8_t, Packet, 1 + g->title_len);
-        Packet[0] = PEER_TITLE_ID;
-        memcpy(Packet + 1, g->title, g->title_len);
-        send_packet_group_peer(g_c->fr_c, friendcon_id, PACKET_ID_DIRECT_CONFERENCE, group_num, Packet, SIZEOF_VLA(Packet));
+        VLA(uint8_t, title_packet, 1 + g->title_len);
+        title_packet[0] = PEER_TITLE_ID;
+        memcpy(title_packet + 1, g->title, g->title_len);
+        send_packet_group_peer(g_c->fr_c, friendcon_id, PACKET_ID_DIRECT_CONFERENCE, group_num, title_packet,
+                               SIZEOF_VLA(title_packet));
     }
 
     return sent;
@@ -2528,9 +2525,9 @@ uint32_t count_chatlist(Group_Chats *g_c)
     uint32_t ret = 0;
     uint32_t i;
 
-    for (i = 0; i < g_c->num_chats; i++) {
+    for (i = 0; i < g_c->num_chats; ++i) {
         if (g_c->chats[i].status != GROUPCHAT_STATUS_NONE) {
-            ret++;
+            ++ret;
         }
     }
 
@@ -2561,7 +2558,7 @@ uint32_t copy_chatlist(Group_Chats *g_c, uint32_t *out_list, uint32_t list_size)
 
         if (g_c->chats[i].status > GROUPCHAT_STATUS_NONE) {
             out_list[ret] = i;
-            ret++;
+            ++ret;
         }
     }
 
diff --git a/toxcore/group.h b/toxcore/group.h
index 6eeeeff8..947c7035 100644
--- a/toxcore/group.h
+++ b/toxcore/group.h
@@ -26,20 +26,20 @@
 
 #include "Messenger.h"
 
-enum {
+typedef enum Groupchat_Status {
     GROUPCHAT_STATUS_NONE,
     GROUPCHAT_STATUS_VALID,
     GROUPCHAT_STATUS_CONNECTED
-};
+} Groupchat_Status;
 
-enum {
+typedef enum Groupchat_Type {
     GROUPCHAT_TYPE_TEXT,
     GROUPCHAT_TYPE_AV
-};
+} Groupchat_Type;
 
 #define MAX_LOSSY_COUNT 256
 
-typedef struct {
+typedef struct Group_Peer {
     uint8_t     real_pk[CRYPTO_PUBLIC_KEY_SIZE];
     uint8_t     temp_pk[CRYPTO_PUBLIC_KEY_SIZE];
 
@@ -52,40 +52,49 @@ typedef struct {
     uint16_t peer_number;
 
     uint8_t  recv_lossy[MAX_LOSSY_COUNT];
-    uint16_t bottom_lossy_number, top_lossy_number;
+    uint16_t bottom_lossy_number;
+    uint16_t top_lossy_number;
 
     void *object;
 } Group_Peer;
 
 #define DESIRED_CLOSE_CONNECTIONS 4
 #define MAX_GROUP_CONNECTIONS 16
-#define GROUP_IDENTIFIER_LENGTH (1 + CRYPTO_SYMMETRIC_KEY_SIZE) /* type + CRYPTO_SYMMETRIC_KEY_SIZE so we can use new_symmetric_key(...) to fill it */
+#define GROUP_IDENTIFIER_LENGTH (1 + CRYPTO_SYMMETRIC_KEY_SIZE) // type + CRYPTO_SYMMETRIC_KEY_SIZE so we can use new_symmetric_key(...) to fill it
 
-enum {
+typedef enum Groupchat_Close_Type {
     GROUPCHAT_CLOSE_NONE,
     GROUPCHAT_CLOSE_CONNECTION,
     GROUPCHAT_CLOSE_ONLINE
-};
+} Groupchat_Close_Type;
 
-typedef struct {
+typedef struct Groupchat_Close {
+    uint8_t type; /* GROUPCHAT_CLOSE_* */
+    uint8_t closest;
+    uint32_t number;
+    uint16_t group_number;
+} Groupchat_Close;
+
+typedef struct Groupchat_Close_Connection {
+    uint8_t entry;
+    uint8_t real_pk[CRYPTO_PUBLIC_KEY_SIZE];
+    uint8_t temp_pk[CRYPTO_PUBLIC_KEY_SIZE];
+} Groupchat_Close_Connection;
+
+typedef void peer_on_join_cb(void *object, uint32_t conference_number, uint32_t peer_number);
+typedef void peer_on_leave_cb(void *object, uint32_t conference_number, void *peer_object);
+typedef void group_on_delete_cb(void *object, uint32_t conference_number);
+
+typedef struct Group_c {
     uint8_t status;
 
     Group_Peer *group;
     uint32_t numpeers;
 
-    struct {
-        uint8_t type; /* GROUPCHAT_CLOSE_* */
-        uint8_t closest;
-        uint32_t number;
-        uint16_t group_number;
-    } close[MAX_GROUP_CONNECTIONS];
+    Groupchat_Close close[MAX_GROUP_CONNECTIONS];
 
     uint8_t real_pk[CRYPTO_PUBLIC_KEY_SIZE];
-    struct {
-        uint8_t entry;
-        uint8_t real_pk[CRYPTO_PUBLIC_KEY_SIZE];
-        uint8_t temp_pk[CRYPTO_PUBLIC_KEY_SIZE];
-    } closest_peers[DESIRED_CLOSE_CONNECTIONS];
+    Groupchat_Close_Connection closest_peers[DESIRED_CLOSE_CONNECTIONS];
     uint8_t changed;
 
     uint8_t identifier[GROUP_IDENTIFIER_LENGTH];
@@ -103,15 +112,28 @@ typedef struct {
 
     void *object;
 
-    void (*peer_on_join)(void *, uint32_t, uint32_t);
-    void (*peer_on_leave)(void *, uint32_t, void *);
-    void (*group_on_delete)(void *, uint32_t);
+    peer_on_join_cb *peer_on_join;
+    peer_on_leave_cb *peer_on_leave;
+    group_on_delete_cb *group_on_delete;
 } Group_c;
 
-typedef void g_conference_invite_cb(Messenger *, uint32_t, int, const uint8_t *, size_t, void *);
-typedef void g_conference_message_cb(Messenger *m, uint32_t, uint32_t, int, const uint8_t *, size_t, void *);
-
-typedef struct {
+typedef void g_conference_invite_cb(Messenger *m, uint32_t friend_number, int type, const uint8_t *cookie,
+                                    size_t length, void *user_data);
+typedef void g_conference_message_cb(Messenger *m, uint32_t conference_number, uint32_t peer_number, int type,
+                                     const uint8_t *message, size_t length, void *user_data);
+typedef void peer_name_cb(Messenger *m, uint32_t conference_number, uint32_t peer_number, const uint8_t *name,
+                          size_t length, void *user_data);
+typedef void peer_list_changed_cb(Messenger *m, uint32_t conference_number, void *user_data);
+typedef void title_cb(Messenger *m, uint32_t conference_number, uint32_t peer_number, const uint8_t *title,
+                      size_t length, void *user_data);
+typedef int lossy_packet_cb(void *object, uint32_t conference_number, uint32_t peer_number, void *peer_object,
+                            const uint8_t *packet, uint16_t length);
+
+typedef struct Group_Lossy_Handler {
+    lossy_packet_cb *function;
+} Group_Lossy_Handler;
+
+typedef struct Group_Chats {
     Messenger *m;
     Friend_Connections *fr_c;
 
@@ -120,13 +142,11 @@ typedef struct {
 
     g_conference_invite_cb *invite_callback;
     g_conference_message_cb *message_callback;
-    void (*peer_name_callback)(Messenger *m, uint32_t, uint32_t, const uint8_t *, size_t, void *);
-    void (*peer_list_changed_callback)(Messenger *m, uint32_t, void *);
-    void (*title_callback)(Messenger *m, uint32_t, uint32_t, const uint8_t *, size_t, void *);
+    peer_name_cb *peer_name_callback;
+    peer_list_changed_cb *peer_list_changed_callback;
+    title_cb *title_callback;
 
-    struct {
-        int (*function)(void *, uint32_t, uint32_t, void *, const uint8_t *, uint16_t);
-    } lossy_packethandlers[256];
+    Group_Lossy_Handler lossy_packethandlers[256];
 } Group_Chats;
 
 /* Set the callback for group invites.
@@ -135,15 +155,13 @@ typedef struct {
  *
  *  data of length is what needs to be passed to join_groupchat().
  */
-void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, int, const uint8_t *,
-                             size_t, void *));
+void g_callback_group_invite(Group_Chats *g_c, g_conference_invite_cb *function);
 
 /* Set the callback for group messages.
  *
  *  Function(Group_Chats *g_c, uint32_t groupnumber, uint32_t friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
  */
-void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *,
-                              size_t, void *));
+void g_callback_group_message(Group_Chats *g_c, g_conference_message_cb *function);
 
 
 /* Set callback function for title changes.
@@ -151,23 +169,21 @@ void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, u
  * Function(Group_Chats *g_c, uint32_t groupnumber, uint32_t friendgroupnumber, uint8_t * title, uint8_t length, void *userdata)
  * if friendgroupnumber == -1, then author is unknown (e.g. initial joining the group)
  */
-void g_callback_group_title(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, const uint8_t *,
-                            size_t, void *));
+void g_callback_group_title(Group_Chats *g_c, title_cb *function);
 
 /* Set callback function for peer nickname changes.
  *
  * It gets called every time a peer changes their nickname.
  *  Function(Group_Chats *g_c, uint32_t groupnumber, uint32_t peernumber, const uint8_t *nick, size_t nick_len, void *userdata)
  */
-void g_callback_peer_name(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, const uint8_t *,
-                          size_t, void *));
+void g_callback_peer_name(Group_Chats *g_c, peer_name_cb *function);
 
 /* Set callback function for peer list changes.
  *
  * It gets called every time the name list changes(new peer, deleted peer)
  *  Function(Group_Chats *g_c, uint32_t groupnumber, void *userdata)
  */
-void g_callback_peer_list_changed(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, void *));
+void g_callback_peer_list_changed(Group_Chats *g_c, peer_list_changed_cb *function);
 
 /* Creates a new groupchat and puts it in the chats array.
  *
@@ -302,9 +318,7 @@ int group_names(const Group_Chats *g_c, uint32_t groupnumber, uint8_t names[][MA
  *
  * Function(void *group object (set with group_set_object), uint32_t groupnumber, uint32_t friendgroupnumber, void *group peer object (set with group_peer_set_object), const uint8_t *packet, uint16_t length)
  */
-void group_lossy_packet_registerhandler(Group_Chats *g_c, uint8_t byte, int (*function)(void *, uint32_t, uint32_t,
-                                        void *,
-                                        const uint8_t *, uint16_t));
+void group_lossy_packet_registerhandler(Group_Chats *g_c, uint8_t byte, lossy_packet_cb *function);
 
 /* High level function to send custom lossy packets.
  *
@@ -372,8 +386,7 @@ void *group_peer_get_object(const Group_Chats *g_c, uint32_t groupnumber, int pe
  * return 0 on success.
  * return -1 on failure.
  */
-int callback_groupchat_peer_new(const Group_Chats *g_c, uint32_t groupnumber, void (*function)(void *, uint32_t,
-                                uint32_t));
+int callback_groupchat_peer_new(const Group_Chats *g_c, uint32_t groupnumber, peer_on_join_cb *function);
 
 /* Set a function to be called when a peer leaves a group chat.
  *
@@ -382,7 +395,7 @@ int callback_groupchat_peer_new(const Group_Chats *g_c, uint32_t groupnumber, vo
  * return 0 on success.
  * return -1 on failure.
  */
-int callback_groupchat_peer_delete(Group_Chats *g_c, uint32_t groupnumber, void (*function)(void *, uint32_t, void *));
+int callback_groupchat_peer_delete(Group_Chats *g_c, uint32_t groupnumber, peer_on_leave_cb *function);
 
 /* Set a function to be called when the group chat is deleted.
  *
@@ -391,7 +404,7 @@ int callback_groupchat_peer_delete(Group_Chats *g_c, uint32_t groupnumber, void
  * return 0 on success.
  * return -1 on failure.
  */
-int callback_groupchat_delete(Group_Chats *g_c, uint32_t groupnumber, void (*function)(void *, uint32_t));
+int callback_groupchat_delete(Group_Chats *g_c, uint32_t groupnumber, group_on_delete_cb *function);
 
 /* Create new groupchat instance. */
 Group_Chats *new_groupchats(Messenger *m);