1 files changed, 18 insertions, 13 deletions

diff --git a/toxcore/ping.c b/toxcore/ping.c
index 80e85a45..e3db6ed1 100644
--- a/toxcore/ping.c
+++ b/toxcore/ping.c
@@ -27,14 +27,16 @@
 #include "config.h"
 #endif
 
-#include <stdbool.h>
 #include <stdint.h>
 
-#include "net_crypto.h"
 #include "DHT.h"
+#include "assoc.h"
+#include "ping.h"
+
+#include "network.h"
+#include "util.h"
 
 #define PING_NUM_MAX 384
-#define PING_TIMEOUT 5 // 5s
 
 /* Ping newly announced nodes to ping per TIME_TOPING seconds*/
 #define TIME_TOPING 5
@@ -45,7 +47,7 @@ typedef struct {
     uint64_t timestamp;
 } pinged_t;
 
-typedef struct {
+struct PING {
     Net_Crypto *c;
 
     pinged_t    pings[PING_NUM_MAX];
@@ -54,15 +56,9 @@ typedef struct {
 
     Node_format toping[MAX_TOPING];
     uint64_t    last_toping;
-} PING;
-
-#define __PING_C__
-
-#include "network.h"
-#include "util.h"
-#include "ping.h"
+};
 
-static bool is_ping_timeout(uint64_t time)
+static int is_ping_timeout(uint64_t time)
 {
     return is_timeout(time, PING_TIMEOUT);
 }
@@ -265,7 +261,16 @@ static int handle_ping_response(void *_dht, IP_Port source, uint8_t *packet, uin
         return 1;
 
     /* Associate client_id with the ip the request was sent to */
-    addto_lists(dht, ping->pings[ping_index - 1].ip_port, packet + 1);
+    int used = addto_lists(dht, ping->pings[ping_index - 1].ip_port, packet + 1);
+
+    if (dht->assoc) {
+        IPPTs ippts;
+        ippts.ip_port = ping->pings[ping_index - 1].ip_port;
+        ippts.timestamp = ping->pings[ping_index - 1].timestamp;
+
+        Assoc_add_entry(dht->assoc, packet + 1, &ippts, &source, used > 0 ? 1 : 0);
+    }
+
     return 0;
 }