1 files changed, 8 insertions, 80 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index d28c1ecf..deb71864 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -164,12 +164,17 @@ void to_net_family(IP *ip)
         ip->family = TOX_AF_INET6;
 }
 
-void to_host_family(IP *ip)
+int to_host_family(IP *ip)
 {
-    if (ip->family == TOX_AF_INET)
+    if (ip->family == TOX_AF_INET) {
         ip->family = AF_INET;
-    else if (ip->family == TOX_AF_INET6)
+        return 0;
+    } else if (ip->family == TOX_AF_INET6) {
         ip->family = AF_INET6;
+        return 0;
+    } else {
+        return -1;
+    }
 }
 
 /* Pack number of nodes into data of maxlength length.
@@ -2082,82 +2087,6 @@ uint16_t closelist_nodes(DHT *dht, Node_format *nodes, uint16_t max_num)
     return count;
 }
 
-/* Put a random node from list of list_size in node. LAN_ok is 1 if LAN ips are ok, 0 if we don't want them. */
-static int random_node_fromlist(Client_data *list, uint16_t list_size, Node_format *node, uint8_t LAN_ok)
-{
-    uint32_t i;
-    uint32_t num_nodes = 0;
-    Client_data *client_list[list_size * 2];
-    IPPTsPng    *assoc_list[list_size * 2];
-
-    for (i = 0; i < list_size; i++) {
-        /* If node is not dead. */
-        Client_data *client = &list[i];
-        IPPTsPng *assoc;
-        uint32_t a;
-
-        for (a = 0, assoc = &client->assoc6; a < 2; a++, assoc = &client->assoc4) {
-            /* If node is good. */
-            if (!is_timeout(assoc->timestamp, BAD_NODE_TIMEOUT)) {
-                if (!LAN_ok) {
-                    if (LAN_ip(assoc->ip_port.ip) == 0)
-                        continue;
-                }
-
-                client_list[num_nodes] = client;
-                assoc_list[num_nodes] = assoc;
-                ++num_nodes;
-            }
-        }
-    }
-
-    if (num_nodes == 0)
-        return -1;
-
-    uint32_t rand_node = rand() % num_nodes;
-    node->ip_port = assoc_list[rand_node]->ip_port;
-    memcpy(node->client_id, client_list[rand_node]->client_id, CLIENT_ID_SIZE);
-    return 0;
-}
-
-/* Put up to max_num random nodes in nodes.
- *
- * return the number of nodes.
- *
- * NOTE:this is used to pick nodes for paths.
- *
- * TODO: remove the LAN stuff from this.
- */
-uint16_t random_nodes_path(const DHT *dht, Node_format *nodes, uint16_t max_num)
-{
-    if (max_num == 0)
-        return 0;
-
-    if (dht->num_friends == 0)
-        return 0;
-
-    uint16_t count = 0;
-    uint16_t list_size = 0;
-    uint32_t i;
-
-    for (i = 0; i < max_num; ++i) {
-        Client_data *list = NULL;
-        uint16_t rand_num = rand() % (dht->num_friends);
-        list = dht->friends_list[rand_num].client_list;
-        list_size = MAX_FRIEND_CLIENTS;
-
-        uint8_t LAN_ok = 1;
-
-        if (count != 0 && LAN_ip(nodes[0].ip_port.ip) != 0)
-            LAN_ok = 0;
-
-        if (random_node_fromlist(list, list_size, &nodes[count], LAN_ok) == 0)
-            ++count;
-    }
-
-    return count;
-}
-
 void do_hardening(DHT *dht)
 {
     uint32_t i;
@@ -2331,7 +2260,6 @@ void kill_DHT(DHT *dht)
     kill_Assoc(dht->assoc);
 #endif
     networking_registerhandler(dht->net, NET_PACKET_GET_NODES, NULL, NULL);
-    networking_registerhandler(dht->net, NET_PACKET_SEND_NODES, NULL, NULL);
     networking_registerhandler(dht->net, NET_PACKET_SEND_NODES_IPV6, NULL, NULL);
     cryptopacket_registerhandler(dht, CRYPTO_PACKET_NAT_PING, NULL, NULL);
     cryptopacket_registerhandler(dht, CRYPTO_PACKET_HARDENING, NULL, NULL);