Some speedups and small fixes.

2 files changed, 24 insertions, 6 deletions

diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index ca3ec560..4a5a37d2 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -286,7 +286,7 @@ static int client_add_to_list(Onion_Client *onion_c, uint32_t num, uint8_t *publ
 
     list_nodes[index].is_stored = is_stored;
     list_nodes[index].timestamp = unix_time();
-    list_nodes[index].last_pinged = unix_time();
+    list_nodes[index].last_pinged = 0;
     list_nodes[index].path_used = set_path_timeouts(onion_c, num, source);
     return 0;
 }
@@ -863,6 +863,11 @@ static void do_friend(Onion_Client *onion_c, uint16_t friendnum)
 
             ++count;
 
+            if (list_nodes[i].last_pinged == 0) {
+                list_nodes[i].last_pinged = unix_time();
+                continue;
+            }
+
             if (is_timeout(list_nodes[i].last_pinged, ANNOUNCE_FRIEND)) {
                 if (client_send_announce_request(onion_c, friendnum + 1, list_nodes[i].ip_port, list_nodes[i].client_id, 0, ~0) == 0) {
                     list_nodes[i].last_pinged = unix_time();
@@ -931,6 +936,13 @@ static void do_announce(Onion_Client *onion_c)
             continue;
 
         ++count;
+
+        /* Don't announce ourselves the first time this is run to new peers */
+        if (list_nodes[i].last_pinged == 0) {
+            list_nodes[i].last_pinged = 1;
+            continue;
+        }
+
         uint32_t interval = ANNOUNCE_INTERVAL_NOT_ANNOUNCED;
 
         if (list_nodes[i].is_stored) {
diff --git a/toxcore/ping.c b/toxcore/ping.c
index 649d3fff..e43c3b1a 100644
--- a/toxcore/ping.c
+++ b/toxcore/ping.c
@@ -38,10 +38,10 @@
 #define PING_NUM_MAX 512
 
 /* Maximum newly announced nodes to ping per TIME_TO_PING seconds. */
-#define MAX_TO_PING 16
+#define MAX_TO_PING 8
 
 /* Ping newly announced nodes to ping per TIME_TO_PING seconds*/
-#define TIME_TO_PING 5
+#define TIME_TO_PING 3
 
 typedef struct {
     IP_Port  ip_port;
@@ -300,12 +300,18 @@ int add_to_ping(PING *ping, uint8_t *client_id, IP_Port ip_port)
             ipport_copy(&ping->to_ping[i].ip_port, &ip_port);
             return 0;
         }
+
+        if (memcmp(ping->to_ping[i].client_id, client_id, CLIENT_ID_SIZE) == 0) {
+            return -1;
+        }
     }
 
+    uint32_t r = rand();
+
     for (i = 0; i < MAX_TO_PING; ++i) {
-        if (id_closest(ping->dht->self_public_key, ping->to_ping[i].client_id, client_id) == 2) {
-            memcpy(ping->to_ping[i].client_id, client_id, CLIENT_ID_SIZE);
-            ipport_copy(&ping->to_ping[i].ip_port, &ip_port);
+        if (id_closest(ping->dht->self_public_key, ping->to_ping[(i + r) % MAX_TO_PING].client_id, client_id) == 2) {
+            memcpy(ping->to_ping[(i + r) % MAX_TO_PING].client_id, client_id, CLIENT_ID_SIZE);
+            ipport_copy(&ping->to_ping[(i + r) % MAX_TO_PING].ip_port, &ip_port);
             return 0;
         }
     }