Some speedups and small fixes.

1 files changed, 11 insertions, 5 deletions

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;
         }
     }