1 files changed, 22 insertions, 36 deletions

diff --git a/toxcore/DHT.h b/toxcore/DHT.h
index 360773ff..9f70f423 100644
--- a/toxcore/DHT.h
+++ b/toxcore/DHT.h
@@ -35,19 +35,33 @@
 /* A list of the clients mathematically closest to ours. */
 #define LCLIENT_LIST 32
 
-/* The list of ip ports along with the ping_id of what we sent them and a timestamp. */
-#define LPING_ARRAY 256 // NOTE: Deprecated (doesn't do anything).
-
-#define LSEND_NODES_ARRAY LPING_ARRAY/2
-
 /* Maximum newly announced nodes to ping per TIME_TOPING seconds. */
 #define MAX_TOPING 16
 
 typedef struct {
+    /* Node routes request correctly (true (1) or false/didn't check (0)) */
+    uint8_t     routes_requests_ok;
+    /* Time which we last checked this.*/
+    uint64_t    routes_requests_timestamp;
+    uint8_t     routes_requests_pingedid[CLIENT_ID_SIZE];
+    /* Node sends correct send_node (true (1) or false/didn't check (0)) */
+    uint8_t     send_nodes_ok;
+    /* Time which we last checked this.*/
+    uint64_t    send_nodes_timestamp;
+    uint8_t     send_nodes_pingedid[CLIENT_ID_SIZE];
+    /* Node can be used to test other nodes (true (1) or false/didn't check (0)) */
+    uint8_t     testing_requests;
+    /* Time which we last checked this.*/
+    uint64_t    testing_timestamp;
+    uint8_t     testing_pingedid[CLIENT_ID_SIZE];
+} Hardening;
+
+typedef struct {
     IP_Port     ip_port;
     uint64_t    timestamp;
     uint64_t    last_pinged;
 
+    Hardening hardening;
     /* Returned by this node. Either our friend or us. */
     IP_Port     ret_ip_port;
     uint64_t    ret_timestamp;
@@ -55,11 +69,6 @@ typedef struct {
 
 typedef struct {
     uint8_t     client_id[CLIENT_ID_SIZE];
-    IPPTsPng    assoc;
-} Client_data_old; /* required to load old state files */
-
-typedef struct {
-    uint8_t     client_id[CLIENT_ID_SIZE];
     IPPTsPng    assoc4;
     IPPTsPng    assoc6;
 } Client_data;
@@ -78,17 +87,6 @@ typedef struct {
 
 typedef struct {
     uint8_t     client_id[CLIENT_ID_SIZE];
-    Client_data_old client_list[MAX_FRIEND_CLIENTS];
-
-    /* Time at which the last get_nodes request was sent. */
-    uint64_t    lastgetnode;
-
-    /* Symetric NAT hole punching stuff. */
-    NAT         nat;
-} DHT_Friend_old;  /* required to load old state files */
-
-typedef struct {
-    uint8_t     client_id[CLIENT_ID_SIZE];
     Client_data client_list[MAX_FRIEND_CLIENTS];
 
     /* Time at which the last get_nodes request was sent. */
@@ -111,11 +109,6 @@ typedef struct {
 
 /*----------------------------------------------------------------------------------*/
 
-typedef struct {
-    IP_Port  ip_port;
-    uint64_t id;
-    uint64_t timestamp;
-} pinged_t;
 
 typedef struct {
     Net_Crypto  *c;
@@ -125,8 +118,10 @@ typedef struct {
     uint16_t     num_friends;
     uint64_t     close_lastgetnodes;
 
-    pinged_t     send_nodes[LSEND_NODES_ARRAY];
     void        *ping;
+
+    /* Note: this key should not be/is not used to transmit any sensitive materials */
+    uint8_t      secret_symmetric_key[crypto_secretbox_KEYBYTES];
 } DHT;
 /*----------------------------------------------------------------------------------*/
 
@@ -240,15 +235,6 @@ DHT *new_DHT(Net_Crypto *c);
 
 void kill_DHT(DHT *dht);
 
-/* Load the DHT from data of size size.
- *  old/new: version of config file
- *
- *  return -1 if failure.
- *  return 0 if success.
- */
-int DHT_load_old(DHT *dht, uint8_t *data, uint32_t size);
-int DHT_load_new(DHT *dht, uint8_t *data, uint32_t size);
-
 /*  return 0 if we are not connected to the DHT.
  *  return 1 if we are.
  */