1 files changed, 12 insertions, 3 deletions

diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index a9fc1643..ed328fb3 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -1425,7 +1425,6 @@ void do_onion_client(Onion_Client *onion_c)
             ++onion_c->onion_connected;
         }
 
-        onion_c->UDP_connected = DHT_non_lan_connected(onion_c->dht);
     } else {
         populate_path_nodes_tcp(onion_c);
 
@@ -1434,12 +1433,22 @@ void do_onion_client(Onion_Client *onion_c)
         }
     }
 
+    onion_c->UDP_connected = DHT_non_lan_connected(onion_c->dht);
+
+    if (is_timeout(onion_c->first_run, ONION_CONNECTION_SECONDS)) {
+        set_tcp_onion_status(onion_c->c->tcp_c, !onion_c->UDP_connected);
+    }
+
     if (onion_connection_status(onion_c)) {
         for (i = 0; i < onion_c->num_friends; ++i) {
             do_friend(onion_c, i);
         }
     }
 
+    if (onion_c->last_run == 0) {
+        onion_c->first_run = unix_time();
+    }
+
     onion_c->last_run = unix_time();
 }
 
@@ -1467,7 +1476,7 @@ Onion_Client *new_onion_client(Net_Crypto *c)
     networking_registerhandler(onion_c->net, NET_PACKET_ONION_DATA_RESPONSE, &handle_data_response, onion_c);
     oniondata_registerhandler(onion_c, ONION_DATA_DHTPK, &handle_dhtpk_announce, onion_c);
     cryptopacket_registerhandler(onion_c->dht, CRYPTO_PACKET_DHTPK, &handle_dht_dhtpk, onion_c);
-    tcp_onion_response_handler(onion_c->c, &handle_tcp_onion, onion_c);
+    set_onion_packet_tcp_connection_callback(onion_c->c->tcp_c, &handle_tcp_onion, onion_c);
 
     return onion_c;
 }
@@ -1483,7 +1492,7 @@ void kill_onion_client(Onion_Client *onion_c)
     networking_registerhandler(onion_c->net, NET_PACKET_ONION_DATA_RESPONSE, NULL, NULL);
     oniondata_registerhandler(onion_c, ONION_DATA_DHTPK, NULL, NULL);
     cryptopacket_registerhandler(onion_c->dht, CRYPTO_PACKET_DHTPK, NULL, NULL);
-    tcp_onion_response_handler(onion_c->c, NULL, NULL);
+    set_onion_packet_tcp_connection_callback(onion_c->c->tcp_c, NULL, NULL);
     memset(onion_c, 0, sizeof(Onion_Client));
     free(onion_c);
 }