refactor: Use Qt's DNS lookup instead of toxcore's.

This is in preparation for sending DNS lookups to tor-resolve. Also prefer IPv6 if enabled. Fixes TokTok#164.
iphydf · Jan 2, 2025 · 62e8b51 · 62e8b51
1 parent 3014906
commit 62e8b51
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 20 deletions.
diff --git a/src/core/core.cpp b/src/core/core.cpp
@@ -17,16 +17,20 @@
 #include "src/model/ibootstraplistgenerator.h"
 #include "src/model/status.h"
 #include "src/persistence/profile.h"
+#include "util/laterdeleter.h"
 #include "util/strongtype.h"
 #include "util/toxcoreerrorparser.h"
 
 #include <QCoreApplication>
 #include <QDateTime>
+#include <QDebug>
+#include <QHostInfo>
 #include <QRegularExpression>
 #include <QString>
 #include <QStringBuilder>
 #include <QTimer>
 
+#include <QtNetwork/qhostaddress.h>
 #include <tox/tox.h>
 
 #include <algorithm>
@@ -362,14 +366,36 @@ bool Core::checkConnection()
     return toxConnected;
 }
 
+void Core::bootstrapTo(const DhtServer& dhtServer, const QHostAddress& address)
+{
+    ASSERT_CORE_THREAD;
+
+    const auto& ip = address.toString().toUtf8();
+
+    ToxPk pk{dhtServer.publicKey};
+    qDebug() << "Connecting to bootstrap node" << pk.toString() << "at" << ip;
+    const uint8_t* pkPtr = pk.getData();
+
+    Tox_Err_Bootstrap error;
+    if (dhtServer.statusUdp) {
+        tox_bootstrap(tox.get(), ip.constData(), dhtServer.udpPort, pkPtr, &error);
+        PARSE_ERR(error);
+    }
+    if (dhtServer.statusTcp) {
+        const auto ports = dhtServer.tcpPorts.size();
+        const auto tcpPort = dhtServer.tcpPorts[rand() % ports];
+        tox_add_tcp_relay(tox.get(), ip.constData(), tcpPort, pkPtr, &error);
+        PARSE_ERR(error);
+    }
+}
+
 /**
  * @brief Connects us to the Tox network
  */
 void Core::bootstrapDht()
 {
     ASSERT_CORE_THREAD;
 
-
     const auto shuffledBootstrapNodes =
         shuffleBootstrapNodes(bootstrapListGenerator.getBootstrapNodes());
     if (shuffledBootstrapNodes.empty()) {
@@ -381,31 +407,25 @@ void Core::bootstrapDht()
     auto numNewNodes = 2;
     for (int i = 0; i < numNewNodes && i < shuffledBootstrapNodes.size(); ++i) {
         const auto& dhtServer = shuffledBootstrapNodes.at(i);
-        QByteArray address;
-        if (!dhtServer.ipv4.isEmpty()) {
-            address = dhtServer.ipv4.toLatin1();
-        } else if (!dhtServer.ipv6.isEmpty() && settings.getEnableIPv6()) {
-            address = dhtServer.ipv6.toLatin1();
+        QString address;
+        if (!dhtServer.ipv6.isEmpty() && settings.getEnableIPv6()) {
+            address = dhtServer.ipv6;
+        } else if (!dhtServer.ipv4.isEmpty()) {
+            address = dhtServer.ipv4;
         } else {
             ++numNewNodes;
             continue;
         }
 
-        ToxPk pk{dhtServer.publicKey};
-        qDebug() << "Connecting to bootstrap node" << pk.toString();
-        const uint8_t* pkPtr = pk.getData();
+        qDebug() << "Resolving" << address;
+        QHostInfo::lookupHost(address, this, [this, dhtServer](const QHostInfo& info) {
+            if (info.error() != QHostInfo::NoError) {
+                qWarning() << "Failed to resolve" << info.hostName() << "address:" << info.errorString();
+                return;
+            }
 
-        Tox_Err_Bootstrap error;
-        if (dhtServer.statusUdp) {
-            tox_bootstrap(tox.get(), address.constData(), dhtServer.udpPort, pkPtr, &error);
-            PARSE_ERR(error);
-        }
-        if (dhtServer.statusTcp) {
-            const auto ports = dhtServer.tcpPorts.size();
-            const auto tcpPort = dhtServer.tcpPorts[rand() % ports];
-            tox_add_tcp_relay(tox.get(), address.constData(), tcpPort, pkPtr, &error);
-            PARSE_ERR(error);
-        }
+            bootstrapTo(dhtServer, info.addresses().first());
+        });
     }
 }
 

diff --git a/src/core/core.h b/src/core/core.h
@@ -28,6 +28,7 @@
 #include <functional>
 #include <memory>
 
+class QHostAddress;
 class CoreAV;
 class CoreFile;
 class IAudioControl;
@@ -220,6 +221,7 @@ public slots:
     void makeTox(QByteArray savedata, ICoreSettings* s);
     void loadFriends();
     void loadConferences();
+    void bootstrapTo(const DhtServer& dhtServer, const QHostAddress& address);
     void bootstrapDht();
 
     void checkLastOnline(uint32_t friendId);

diff --git a/src/core/toxoptions.cpp b/src/core/toxoptions.cpp
@@ -24,6 +24,10 @@ ToxOptions::ToxOptions(Tox_Options* options_, const QByteArray& proxyAddrData_)
     : options(options_)
     , proxyAddrData(proxyAddrData_)
 {
+    assert(options != nullptr);
+#if TOX_VERSION_IS_API_COMPATIBLE(0, 2, 21)
+    tox_options_set_experimental_disable_dns(options_, true);
+#endif
 }
 
 ToxOptions::~ToxOptions()

diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
@@ -8,6 +8,8 @@ add_library(
   util_library STATIC
   include/util/algorithm.h
   src/algorithm.cpp
+  include/util/laterdeleter.h
+  src/laterdeleter.cpp
   include/util/interface.h
   include/util/ranges.h
   src/ranges.cpp

diff --git a/util/include/util/laterdeleter.h b/util/include/util/laterdeleter.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * Copyright © 2025 The TokTok team.
+ */
+
+#pragma once
+
+class QObject;
+
+struct LaterDeleter
+{
+    QObject* ptr;
+
+    explicit LaterDeleter(QObject* ptr_);
+    ~LaterDeleter();
+};
diff --git a/util/src/laterdeleter.cpp b/util/src/laterdeleter.cpp
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later
+ * Copyright © 2025 The TokTok team.
+ */
+
+#include "util/laterdeleter.h"
+
+#include <QObject>
+
+LaterDeleter::LaterDeleter(QObject* ptr_)
+    : ptr(ptr_)
+{
+}
+
+LaterDeleter::~LaterDeleter()
+{
+    ptr->deleteLater();
+}