Nodes: connect to clearnet nodes during initial sync on Tais/Whonix

diff --git a/src/utils/WebsocketNotifier.cpp b/src/utils/WebsocketNotifier.cpp
index 6ffca2d51676e7cfa5ae1c8dfcd8813895c6524c..5ba833ed6ad99ecdcfd3f373901751fad272c7d4 100644 (file)
--- a/src/utils/WebsocketNotifier.cpp
+++ b/src/utils/WebsocketNotifier.cpp
@@ -121,9 +121,6 @@ void WebsocketNotifier::onWSNodes(const QJsonArray &nodes) {
         if(nettype == "testnet" && networkType != NetworkType::TESTNET)
             continue;
 
-        if(type == "clearnet" && (TailsOS::detect() || WhonixOS::detect() || Utils::isTorsocks()))
-            continue;
-
         FeatherNode node{obj.value("address").toString(),
                          obj.value("height").toInt(),
                          obj.value("target_height").toInt(),

diff --git a/src/utils/nodes.cpp b/src/utils/nodes.cpp
index 86fc2395e58f37287ddefdfeddf878e16b09beba..c1bfea04bf04b3147e57a9dbd673a2ae259552db 100644 (file)
--- a/src/utils/nodes.cpp
+++ b/src/utils/nodes.cpp
@@ -383,18 +383,11 @@ void Nodes::onWalletRefreshed() {
         if (m_connection.isOnion())
             return;
 
-        // Don't reconnect on Tails or Whonix (all traffic is already routed through Tor)
-        if (TailsOS::detect() || WhonixOS::detect())
-            return;
-
         this->autoConnect(true);
     }
 }
 
 bool Nodes::useOnionNodes() {
-    if (TailsOS::detect() || WhonixOS::detect()) {
-        return true;
-    }
     auto privacyLevel = config()->get(Config::torPrivacyLevel).toInt();
     if (privacyLevel == Config::allTor) {
         return true;
@@ -426,6 +419,10 @@ bool Nodes::useTorProxy(const FeatherNode &node) {
         return false;
     }
 
+    if (TailsOS::detect() || WhonixOS::detect()) {
+        return true;
+    }
+
     return this->useOnionNodes();
 }