1 files changed, 17 insertions, 20 deletions

diff --git a/toxcore/DHT.h b/toxcore/DHT.h
index e6f227f7..7cb3198d 100644
--- a/toxcore/DHT.h
+++ b/toxcore/DHT.h
@@ -26,7 +26,6 @@
 
 #include "net_crypto.h"
 
-
 /* Size of the client_id in bytes. */
 #define CLIENT_ID_SIZE crypto_box_PUBLICKEYBYTES
 
@@ -92,22 +91,23 @@ typedef Node46_format Node_format;
 typedef Node4_format Node_format;
 #endif
 
+/*----------------------------------------------------------------------------------*/
+
 typedef struct {
-    IP_Port     ip_port;
-    uint64_t    ping_id;
-    uint64_t    timestamp;
-} Pinged;
+    IP_Port  ip_port;
+    uint64_t id;
+    uint64_t timestamp;
+} pinged_t;
 
-/*----------------------------------------------------------------------------------*/
 typedef struct {
     Net_Crypto  *c;
+
     Client_data  close_clientlist[LCLIENT_LIST];
     DHT_Friend  *friends_list;
     uint16_t     num_friends;
-    Pinged       send_nodes[LSEND_NODES_ARRAY];
-    Node_format  toping[MAX_TOPING];
-    uint64_t     last_toping;
     uint64_t     close_lastgetnodes;
+
+    pinged_t     send_nodes[LSEND_NODES_ARRAY];
     void        *ping;
 } DHT;
 /*----------------------------------------------------------------------------------*/
@@ -152,6 +152,14 @@ int DHT_delfriend(DHT *dht, uint8_t *client_id);
  */
 int DHT_getfriendip(DHT *dht, uint8_t *client_id, IP_Port *ip_port);
 
+/* Compares client_id1 and client_id2 with client_id.
+ *
+ *  return 0 if both are same distance.
+ *  return 1 if client_id1 is closer.
+ *  return 2 if client_id2 is closer.
+ */
+int id_closest(uint8_t *id, uint8_t *id1, uint8_t *id2);
+
 /* Run this function at least a couple times per second (It's the main loop). */
 void do_DHT(DHT *dht);
 
@@ -176,17 +184,6 @@ void DHT_bootstrap(DHT *dht, IP_Port ip_port, uint8_t *public_key);
 int DHT_bootstrap_from_address(DHT *dht, const char *address, uint8_t ipv6enabled,
                                uint16_t port, uint8_t *public_key);
 
-/* Add nodes to the toping list.
- * All nodes in this list are pinged every TIME_TOPING seconds
- * and are then removed from the list.
- * If the list is full the nodes farthest from our client_id are replaced.
- * The purpose of this list is to enable quick integration of new nodes into the
- * network while preventing amplification attacks.
- *
- *  return 0 if node was added.
- *  return -1 if node was not added.
- */
-int add_toping(DHT *dht, uint8_t *client_id, IP_Port ip_port);
 
 /* ROUTING FUNCTIONS */