More DHT fixes.

2 files changed, 7 insertions, 4 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 2220b1d7..84a245bb 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -63,7 +63,7 @@
 #define NAT_PING_RESPONSE   1
 
 /* Number of get node requests to send to quickly find close nodes. */
-#define MAX_BOOTSTRAP_TIMES 10
+#define MAX_BOOTSTRAP_TIMES 20
 
 /* Compares pk1 and pk2 with pk.
  *
@@ -486,6 +486,7 @@ static _Bool add_to_list(Node_format *nodes_list, unsigned int length, const uin
             memcpy(pk_bak, nodes_list[i].public_key, crypto_box_PUBLICKEYBYTES);
             ip_port_bak = nodes_list[i].ip_port;
             memcpy(nodes_list[i].public_key, pk, crypto_box_PUBLICKEYBYTES);
+            nodes_list[i].ip_port = ip_port;
 
             if (i != (length - 1))
                 add_to_list(nodes_list, length, pk_bak, ip_port_bak, cmp_pk);
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index 11a7b629..05767c74 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -1439,7 +1439,10 @@ void do_onion_client(Onion_Client *onion_c)
     if (onion_c->last_run == unix_time())
         return;
 
-    do_announce(onion_c);
+    if (is_timeout(onion_c->first_run, ONION_CONNECTION_SECONDS)) {
+        populate_path_nodes(onion_c);
+        do_announce(onion_c);
+    }
 
     if (onion_isconnected(onion_c)) {
         if (onion_c->onion_connected < ONION_CONNECTION_SECONDS * 2) {
@@ -1456,8 +1459,7 @@ void do_onion_client(Onion_Client *onion_c)
 
     _Bool UDP_connected = DHT_non_lan_connected(onion_c->dht);
 
-    if (is_timeout(onion_c->first_run, ONION_CONNECTION_SECONDS)) {
-        populate_path_nodes(onion_c);
+    if (is_timeout(onion_c->first_run, ONION_CONNECTION_SECONDS * 2)) {
         set_tcp_onion_status(onion_c->c->tcp_c, !UDP_connected);
     }