use tox_callback_friend_connection_status instead of polling

3 files changed, 20 insertions, 47 deletions

diff --git a/client.c b/client.c
index 5ea3b4d..67d4fd3 100644
--- a/client.c
+++ b/client.c
@@ -279,13 +279,10 @@ int do_client_loop(uint8_t *tox_id_str)
     unsigned char tox_packet_buf[PROTOCOL_MAX_PACKET_SIZE];
     unsigned char tox_id[TOX_ADDRESS_SIZE];
     uint32_t friendnumber = 0;
-    TOX_CONNECTION last_friend_connection_status = TOX_CONNECTION_NONE;
-    time_t last_friend_connection_status_received = 0;
     struct timeval tv;
     fd_set fds;
     static time_t invitation_sent_time = 0;
     uint32_t invitations_sent = 0;
-    TOX_ERR_FRIEND_QUERY friend_query_error;
     TOX_ERR_FRIEND_CUSTOM_PACKET custom_packet_error;
 
     client_tunnel.sockfd = 0;
@@ -371,17 +368,7 @@ int do_client_loop(uint8_t *tox_id_str)
                 break;
             case CLIENT_STATE_SENTREQUEST:
                 {
-                    TOX_CONNECTION friend_connection_status;
-                    friend_connection_status = tox_friend_get_connection_status(tox, friendnumber, &friend_query_error);
-                    if(friend_query_error != TOX_ERR_FRIEND_QUERY_OK)
                     {
-                        log_printf(L_DEBUG, "tox_friend_get_connection_status: error %u", friend_query_error);
-                    }
-                    else
-                    {
-                        last_friend_connection_status_received = time(NULL);
-                        last_friend_connection_status = friend_connection_status;
-
                         if(friend_connection_status != TOX_CONNECTION_NONE)
                         {
                             const char* status = readable_connection_status(friend_connection_status);
@@ -390,7 +377,8 @@ int do_client_loop(uint8_t *tox_id_str)
                         }
                         else
                         {
-                            if(1 && (time(NULL) - invitation_sent_time > 45))
+                            const int INVITATION_SEND_INTERVAL = 90;
+                            if (time(NULL) - invitation_sent_time > INVITATION_SEND_INTERVAL)
                             {
                                 TOX_ERR_FRIEND_DELETE error = 0;
 
@@ -597,44 +585,14 @@ int do_client_loop(uint8_t *tox_id_str)
                     fds = client_master_fdset;
 
                     /* Check friend connection status changes */
-                    /* TODO: learned about tox_friend_connection_status_cb after writing this... */
-                    /* TODO: also check friend status tox_callback_friend_status */
-                    if(time(NULL) - last_friend_connection_status_received > 15)
+                    if(friend_connection_status == TOX_CONNECTION_NONE)
                     {
-                        TOX_CONNECTION friend_connection_status;
-                        friend_connection_status = tox_friend_get_connection_status(tox, friendnumber, &friend_query_error);
-                        if(friend_query_error != TOX_ERR_FRIEND_QUERY_OK)
-                        {
-                            log_printf(L_DEBUG, "tox_friend_get_connection_status: error %u\n", friend_query_error);
-                        }
-                        else
-                        {
-                            if(friend_connection_status != last_friend_connection_status)
-                            {
-                                const char* status = readable_connection_status(friend_connection_status);
-                                log_printf(L_INFO, "Friend connection status changed to: %s (%d)\n", status, friend_connection_status);
-
-                                                                if(friend_connection_status == TOX_CONNECTION_NONE)
-                                                                {
-                                                                        state = CLIENT_STATE_CONNECTION_LOST;
-                                                                }
-                            }
-
-                            last_friend_connection_status_received = time(NULL);
-                            last_friend_connection_status = friend_connection_status;
-                        }
+                        state = CLIENT_STATE_CONNECTION_LOST;
                     }
                 }
                 break;
             case CLIENT_STATE_CONNECTION_LOST:
                 {
-                    TOX_CONNECTION friend_connection_status;
-                    friend_connection_status = tox_friend_get_connection_status(tox, friendnumber, &friend_query_error);
-                    if(friend_query_error != TOX_ERR_FRIEND_QUERY_OK)
-                    {
-                        log_printf(L_DEBUG, "tox_friend_get_connection_status: error %u\n", friend_query_error);
-                    }
-                    else
                     {
                         if(friend_connection_status == TOX_CONNECTION_NONE)
                         {
diff --git a/main.c b/main.c
index 117747b..f38784e 100644
--- a/main.c
+++ b/main.c
@@ -12,6 +12,7 @@ Tox *tox;
 int client_socket = 0;
 TOX_CONNECTION connection_status = TOX_CONNECTION_NONE;
 
+TOX_CONNECTION friend_connection_status = TOX_CONNECTION_NONE;
 /** CONFIGURATION OPTIONS **/
 /* Whether we're a client */
 int client_mode = 0;
@@ -908,7 +909,7 @@ void accept_friend_request(Tox *tox, const uint8_t *public_key, const uint8_t *m
         return;
     }
 
-    log_printf(L_INFO, "Accepted friend request from %s as %d\n", tox_printable_id, friendnumber);
+    log_printf(L_INFO, "Accepted friend request from %s as #%d\n", tox_printable_id, friendnumber);
 }
 
 /* Callback for tox_callback_self_connection_status() */
@@ -920,6 +921,17 @@ void handle_connection_status_change(Tox *tox, TOX_CONNECTION p_connection_statu
     log_printf(L_INFO, "Connection status changed: %s", status);
 }
 
+void handle_friend_connection_status(Tox *tox, uint32_t friend_number, TOX_CONNECTION connection_status, void *user_data)
+{
+    const char *status = NULL;
+    status = readable_connection_status(connection_status);
+    log_printf(L_INFO, "Friend #%d connection status changed: %s", friend_number, status);
+    if(client_mode)
+    {
+        friend_connection_status = connection_status;
+    }
+}
+
 void cleanup()
 {
     log_printf(L_DEBUG, "kthxbye\n");
@@ -1521,6 +1533,7 @@ int main(int argc, char *argv[])
 
     set_tox_username(tox);
     tox_callback_self_connection_status(tox, handle_connection_status_change);
+    tox_callback_friend_connection_status(tox, handle_friend_connection_status);
 
     do_bootstrap(tox);
 
diff --git a/main.h b/main.h
index 17fb9b9..b998acc 100644
--- a/main.h
+++ b/main.h
@@ -112,6 +112,8 @@ extern char shared_secret[TOX_MAX_FRIEND_REQUEST_LENGTH];
 extern int select_nfds;
 extern tunnel *by_id;
 
+extern TOX_CONNECTION friend_connection_status;
+
 void parse_lossless_packet(Tox *tox, uint32_t friendnumber, const uint8_t *data, size_t len, void *tmp);
 tunnel *tunnel_create(int sockfd, int connid, uint32_t friendnumber);
 void tunnel_delete(tunnel *t);