Updated to v2.6

Author: bernerdad

backend/windows/windscribe_service/logger.cpp

@@ -94,17 +94,3 @@ void Logger::debugOut(const char* format, ...)
 
     ::OutputDebugStringA(szMsg);
 }
-
-void Logger::debugOut(const char *format, ...)
-{
-    va_list arg_list;
-    va_start(arg_list, format);
-
-    char szMsg[1024];
-    szMsg[1023] = '\0';
-
-    _vsnprintf(szMsg, 1023, format, arg_list);
-    va_end(arg_list);
-
-    ::OutputDebugStringA(szMsg);
-}

client/common/utils/winutils.cpp

@@ -1536,4 +1536,3 @@ std::optional<bool> WinUtils::haveInternetConnectivity()
 
     return false;
 }
-

client/engine/engine/connectionmanager/connectionmanager.cpp

@@ -560,7 +560,6 @@ void ConnectionManager::onConnectionError(CONNECT_ERROR err)
         // immediately stop trying to connect
         state_ = STATE_DISCONNECTED;
         timerReconnection_.stop();
-        getWireGuardConfigInLoop_->stop();
         Q_EMIT errorDuringConnection(err);
     }
     else if (err == CONNECT_ERROR::STATE_TIMEOUT_FOR_AUTOMATIC

client/engine/engine/connectionmanager/finishactiveconnections.cpp

@@ -66,9 +66,6 @@ void FinishActiveConnections::finishIkev2ActiveConnections_win(IHelper *helper)
 
 void FinishActiveConnections::finishWireGuardActiveConnections_win(IHelper *helper)
 {
-    Q_UNUSED(helper)
-    // No need to stop the wireguard service, as it automatically stops if the client exits prematurely.
-    // But we need to remove dns leak protection.
     Helper_win *helper_win = dynamic_cast<Helper_win *>(helper);
     helper_win->stopWireGuard();
     helper_win->disableDnsLeaksProtection();

client/engine/engine/dnsresolver/dnsrequest.cpp

@@ -54,7 +54,6 @@ void DnsRequest::onResolved(const QStringList &ips, int aresErrorCode, qint64 el
 {
     elapsedMs_ = elapsedMs;
     aresErrorCode_ = aresErrorCode;
-    qCDebug(LOG_DNS_RESOLVER) << "Resolved " << hostname_ << ": " << ips << aresErrorCode;
     ips_ = ips;
     if (isError()) {
         qCDebug(LOG_NETWORK) << "Could not resolve" << hostname_ << "(servers:" << dnsServers_ << "):" << aresErrorCode;

client/engine/engine/engine.cpp

@@ -1100,7 +1100,7 @@ void Engine::speedRatingImpl(int rating, const QString &localExternalIp)
 
 void Engine::setSettingsImpl(const types::EngineSettings &engineSettings)
 {
-    qCDebug(LOG_BASIC) << "Engine::";
+    qCDebug(LOG_BASIC) << "Engine::setSettingsImpl";
 
     bool isAllowLanTrafficChanged = engineSettings_.isAllowLanTraffic() != engineSettings.isAllowLanTraffic();
     bool isUpdateChannelChanged = engineSettings_.updateChannel() != engineSettings.updateChannel();
@@ -1962,8 +1962,6 @@ void Engine::onNetworkChange(const types::NetworkInterface &networkInterface)
         }
     }
 
-void Engine::onNetworkChange(const ProtoTypes::NetworkInterface &networkInterface)
-{
     Q_EMIT networkChanged(networkInterface);
 }
 

client/engine/engine/firewall/firewallcontroller_linux.cpp

@@ -302,52 +302,3 @@ QStringList FirewallController_linux::getLocalAddresses(const QString iface) con
     freeifaddrs(ifap);
     return addrs;
 }
-
-void FirewallController_linux::removeWindscribeRules(const QString &comment, bool isIPv6)
-{
-    QString cmd;
-    int exitCode;
-
-    QStringList rules = getWindscribeRules(comment, true, isIPv6);
-
-    // delete Windscribe rules, if found
-    if (!rules.isEmpty())
-    {
-        QString curTable;
-        for (int ind = 0; ind < rules.count(); ++ind)
-        {
-            if (rules[ind].startsWith("*"))
-            {
-                curTable = rules[ind];
-            }
-
-            if (rules[ind].contains("COMMIT") && curTable.contains("*filter"))
-            {
-                rules.insert(ind, "-X windscribe_input");
-                rules.insert(ind + 1, "-X windscribe_output");
-                break;
-            }
-        }
-
-        QFile file(pathToTempTable_);
-        if (file.open(QIODevice::WriteOnly | QIODevice::Text))
-        {
-            QTextStream out(&file);
-            for (const auto &l : rules)
-            {
-                out << l << "\n";
-            }
-            file.close();
-        }
-
-
-        cmd = (isIPv6 ? "ip6tables-restore -n < " : "iptables-restore -n < ") + pathToTempTable_;
-        helper_->executeRootCommand(cmd, &exitCode);
-        if (exitCode != 0)
-        {
-            qCDebug(LOG_FIREWALL_CONTROLLER) << "Unsuccessful exit code:" << exitCode << " for cmd:" << cmd;
-        }
-
-        QFile::remove(pathToTempTable_);
-    }
-}

client/engine/engine/wireguardconfig/getwireguardconfiginloop.cpp

@@ -3,7 +3,6 @@
 
 #include "types/enums.h"
 #include <QString>
-#include "utils/protobuf_includes.h"
 
 class IHelper;
 class QWidget;
@@ -23,8 +22,6 @@ class DnsScripts_linux
     SCRIPT_TYPE dnsManager();
     void setDnsManager(DNS_MANAGER_TYPE d);
 
-    void setDnsManager(ProtoTypes::DnsManagerType d);
-
 private:
     DnsScripts_linux();