Merge 0706db3 into 972a6d6

TokTok · May 18, 2020 · b1a0ba3 · b1a0ba3
2 parents 972a6d6 + 0706db3
commit b1a0ba3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
@@ -414,12 +414,14 @@ int32_t m_add_group(Messenger *m, GC_Chat *chat)
     }
 
     Group *g = &m->grouplist[group_number];
+
     int friend_connection_id = g->friendcon_id;
     Friend_Conn *connection = get_conn(m->fr_c, friend_connection_id);
+
     int onion_friend_number = friend_conn_get_onion_friendnum(connection);
     Onion_Friend *onion_friend = onion_get_friend(m->onion_c, onion_friend_number);
-    onion_friend_set_gc_public_key(onion_friend, get_chat_id(chat->chat_public_key));
 
+    onion_friend_set_gc_public_key(onion_friend, get_chat_id(chat->chat_public_key));
     try_pack_gc_data(m, chat, onion_friend);
 
     return group_number;
@@ -2871,8 +2873,7 @@ static int try_pack_gc_data(const Messenger *m, GC_Chat *chat, Onion_Friend *oni
     chat->update_self_announces = false;
     chat->last_self_announce_time = mono_time_get(chat->mono_time);
 
-    LOGGER_DEBUG(chat->logger, "Published group announce. TCP status: %d, UDP status: %d", tcp_num > 0,
-                 chat->self_ip_port_set);
+    LOGGER_DEBUG(chat->logger, "Published group announce. TCP status: %d, UDP status: %d", tcp_num > 0, ip_port_is_set);
     return 0;
 }
 

diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c
@@ -3985,7 +3985,7 @@ static int handle_gc_hs_response_ack(Messenger *m, int group_number, GC_Connecti
         return -1;
     }
 
-    gconn->handshaked = true;  // has to be true before we can send a lossless paket
+    gconn->handshaked = true;  // has to be true before we can send a lossless packet
 
     if (send_gc_invite_request(chat, gconn) == -1) {
         gconn->handshaked = false;
@@ -5442,7 +5442,10 @@ static void do_self_connection(Messenger *m, GC_Chat *chat)
     }
 
     if (mono_time_is_timeout(chat->mono_time, chat->last_self_announce_time, GC_ANNOUNCE_REFRESH_INTERVAL)) {
-        if (can_announce) {
+        uint32_t num_confirmed_peers = get_gc_confirmed_numpeers(chat);
+        bool should_announce = random_int_range(num_confirmed_peers) == 0;
+
+        if (can_announce && should_announce) {
             chat->update_self_announces = true;
         }
     }

diff --git a/toxcore/group_chats.h b/toxcore/group_chats.h
@@ -92,18 +92,18 @@ typedef enum Group_Peer_Status {
     GS_INVALID,
 } Group_Peer_Status;
 
-typedef enum Group_Connection_State {
+typedef enum GC_Conn_state {
     CS_NONE,
     CS_DISCONNECTED,
     CS_CONNECTING,
     CS_CONNECTED,
     CS_INVALID,
-} Group_Connection_State;
+} GC_Conn_state;
 
-typedef enum Saved_Group_Connection_State {
+typedef enum Saved_GC_Conn_state {
     SGCS_DISCONNECTED,
     SGCS_CONNECTED,
-} Saved_Group_Connection_State;
+} Saved_GC_Conn_state;
 
 typedef enum Group_Join_Rejected {
     GJ_NICK_TAKEN,
@@ -279,6 +279,8 @@ typedef struct GC_Chat {
     GC_Connection   *gcc;
     GC_Moderation   moderation;
 
+    GC_Conn_state   connection_state;
+
     GC_SharedState  shared_state;
     uint8_t         shared_state_sig[SIGNATURE_SIZE];    /* Signed by founder using the chat secret key */
 
@@ -287,7 +289,7 @@ typedef struct GC_Chat {
 
     uint16_t    peers_checksum;   /* A sum of the public key hash of every confirmed peer in the group */
     uint32_t    numpeers;
-    uint32_t    base_peer_id;  /* An incrementing counter used to assign peers unique ID's */
+    uint32_t    base_peer_id;    /* An incrementing counter used to assign peers unique ID's */
     int         group_number;
 
     uint8_t     chat_public_key[EXT_PUBLIC_KEY];    /* the chat_id is the sig portion */
@@ -298,11 +300,10 @@ typedef struct GC_Chat {
     uint8_t     self_secret_key[EXT_SECRET_KEY];
     uint32_t    self_public_key_hash;
 
-    uint8_t     connection_state;
     uint64_t    time_connected;
     uint64_t    last_ping_interval;
     uint64_t    last_sync_request;
-    uint8_t     join_type;   /* How we joined the group (invite or DHT) */
+    uint8_t     join_type;    /* How we joined the group (invite or DHT) */
 
     /* keeps track of frequency of new inbound connections */
     uint8_t     connection_O_metre;
@@ -312,11 +313,11 @@ typedef struct GC_Chat {
     int32_t     saved_invites[MAX_GC_SAVED_INVITES];
     uint8_t     saved_invites_index;
 
-    uint8_t     m_group_public_key[CRYPTO_PUBLIC_KEY_SIZE];  /* Identifier for group's messenger friend connection */
+    uint8_t     m_group_public_key[CRYPTO_PUBLIC_KEY_SIZE];    /* Identifier for group's messenger friend connection */
 
-    bool        update_self_announces;
-    uint64_t    last_self_announce_check;
-    uint64_t    last_self_announce_time;
+    bool        update_self_announces;     /* true if we should try to update our announcements */
+    uint64_t    last_self_announce_check;  /* the last time we checked if we should update our announcements */
+    uint64_t    last_self_announce_time;   /* the last time we successfully updated our announcements */
 
     Saved_Group *save;
 } GC_Chat;