Remove assoc

1 files changed, 1 insertions, 104 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index b4ba3fd5..ca9c17ea 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -29,9 +29,6 @@
 
 #include "DHT.h"
 
-#ifdef ENABLE_ASSOC_DHT
-#include "assoc.h"
-#endif
 #include "LAN_discovery.h"
 #include "logger.h"
 #include "misc_tools.h"
@@ -773,60 +770,7 @@ int get_close_nodes(const DHT *dht, const uint8_t *public_key, Node_format *node
                     uint8_t is_LAN, uint8_t want_good)
 {
     memset(nodes_list, 0, MAX_SENT_NODES * sizeof(Node_format));
-#ifdef ENABLE_ASSOC_DHT
-
-    if (!dht->assoc)
-#endif
-        return get_somewhat_close_nodes(dht, public_key, nodes_list, sa_family, is_LAN, want_good);
-
-#ifdef ENABLE_ASSOC_DHT
-    // TODO(irungentoo): assoc, sa_family 0 (don't care if ipv4 or ipv6) support.
-    Client_data *result[MAX_SENT_NODES];
-
-    Assoc_close_entries request;
-    memset(&request, 0, sizeof(request));
-    request.count = MAX_SENT_NODES;
-    request.count_good = MAX_SENT_NODES - 2; /* allow 2 'indirect' nodes */
-    request.result = result;
-    request.wanted_id = public_key;
-    request.flags = (is_LAN ? LANOk : 0) + (sa_family == AF_INET ? ProtoIPv4 : ProtoIPv6);
-
-    uint8_t num_found = Assoc_get_close_entries(dht->assoc, &request);
-
-    if (!num_found) {
-        LOGGER_DEBUG(dht->log, "get_close_nodes(): Assoc_get_close_entries() returned zero nodes");
-        return get_somewhat_close_nodes(dht, public_key, nodes_list, sa_family, is_LAN, want_good);
-    }
-
-    LOGGER_DEBUG(dht->log, "get_close_nodes(): Assoc_get_close_entries() returned %i 'direct' and %i 'indirect' nodes",
-                 request.count_good, num_found - request.count_good);
-
-    uint8_t i, num_returned = 0;
-
-    for (i = 0; i < num_found; i++) {
-        Client_data *client = result[i];
-
-        if (client) {
-            id_copy(nodes_list[num_returned].public_key, client->public_key);
-
-            if (sa_family == AF_INET)
-                if (ipport_isset(&client->assoc4.ip_port)) {
-                    nodes_list[num_returned].ip_port = client->assoc4.ip_port;
-                    num_returned++;
-                    continue;
-                }
-
-            if (sa_family == AF_INET6)
-                if (ipport_isset(&client->assoc6.ip_port)) {
-                    nodes_list[num_returned].ip_port = client->assoc6.ip_port;
-                    num_returned++;
-                    continue;
-                }
-        }
-    }
-
-    return num_returned;
-#endif
+    return get_somewhat_close_nodes(dht, public_key, nodes_list, sa_family, is_LAN, want_good);
 }
 
 static uint8_t cmp_public_key[crypto_box_PUBLICKEYBYTES];
@@ -1156,18 +1100,6 @@ int addto_lists(DHT *dht, IP_Port ip_port, const uint8_t *public_key)
         }
     }
 
-#ifdef ENABLE_ASSOC_DHT
-
-    if (dht->assoc) {
-        IPPTs ippts;
-
-        ippts.ip_port = ip_port;
-        ippts.timestamp = unix_time();
-
-        Assoc_add_entry(dht->assoc, public_key, &ippts, NULL, used ? 1 : 0);
-    }
-
-#endif
     return used;
 }
 
@@ -1224,18 +1156,6 @@ static int returnedip_ports(DHT *dht, IP_Port ip_port, const uint8_t *public_key
     }
 
 end:
-#ifdef ENABLE_ASSOC_DHT
-
-    if (dht->assoc) {
-        IPPTs ippts;
-        ippts.ip_port = ip_port;
-        ippts.timestamp = temp_time;
-        /* this is only a hear-say entry, so ret-ipp is NULL, but used is required
-         * to decide how valuable it is ("used" may throw an "unused" entry out) */
-        Assoc_add_entry(dht->assoc, public_key, &ippts, NULL, used ? 1 : 0);
-    }
-
-#endif
     return 0;
 }
 
@@ -1788,16 +1708,6 @@ void DHT_getnodes(DHT *dht, const IP_Port *from_ipp, const uint8_t *from_id, con
 
 void DHT_bootstrap(DHT *dht, IP_Port ip_port, const uint8_t *public_key)
 {
-    /*#ifdef ENABLE_ASSOC_DHT
-       if (dht->assoc) {
-           IPPTs ippts;
-           ippts.ip_port = ip_port;
-           ippts.timestamp = 0;
-
-           Assoc_add_entry(dht->assoc, public_key, &ippts, NULL, 0);
-       }
-       #endif*/
-
     getnodes(dht, ip_port, public_key, dht->self_public_key, NULL);
 }
 int DHT_bootstrap_from_address(DHT *dht, const char *address, uint8_t ipv6enabled,
@@ -2700,9 +2610,6 @@ DHT *new_DHT(Logger *log, Networking_Core *net)
 
     ping_array_init(&dht->dht_ping_array, DHT_PING_ARRAY_SIZE, PING_TIMEOUT);
     ping_array_init(&dht->dht_harden_ping_array, DHT_PING_ARRAY_SIZE, PING_TIMEOUT);
-#ifdef ENABLE_ASSOC_DHT
-    dht->assoc = new_Assoc_default(dht->log, dht->self_public_key);
-#endif
     uint32_t i;
 
     for (i = 0; i < DHT_FAKE_FRIEND_NUMBER; ++i) {
@@ -2738,20 +2645,10 @@ void do_DHT(DHT *dht)
 #if DHT_HARDENING
     do_hardening(dht);
 #endif
-#ifdef ENABLE_ASSOC_DHT
-
-    if (dht->assoc) {
-        do_Assoc(dht->assoc, dht);
-    }
-
-#endif
     dht->last_run = unix_time();
 }
 void kill_DHT(DHT *dht)
 {
-#ifdef ENABLE_ASSOC_DHT
-    kill_Assoc(dht->assoc);
-#endif
     networking_registerhandler(dht->net, NET_PACKET_GET_NODES, NULL, NULL);
     networking_registerhandler(dht->net, NET_PACKET_SEND_NODES_IPV6, NULL, NULL);
     cryptopacket_registerhandler(dht, CRYPTO_PACKET_NAT_PING, NULL, NULL);