v2.17.2

Author: bernerdad

.gitlab-ci.yml

@@ -88,15 +88,6 @@ variables:
     - curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem
       --create-dirs -o ${BUILD_LIBS_FOLDER}/openvpn_dco.zip "${NEXUS_PATH_DEPS}/${OS_IDENTIFIER}/openvpn_dco.zip"
 
-.download_dependency_qt:
-  script:
-    - curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem
-      --create-dirs -o ${BUILD_LIBS_FOLDER}/qt.zip "${NEXUS_PATH_DEPS}/${OS_IDENTIFIER}/qt.zip"
-
-.download_dependency_qt_static:
-  script:
-    - if ($SKIP_DOWNLOAD -ne "1") { curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem --create-dirs -o ${BUILD_LIBS_FOLDER}/qt-static.zip "${NEXUS_PATH_DEPS}/${OS_IDENTIFIER}/qt-static.zip" }
-
 .download_dependency_wintun:
   script:
     - curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem
@@ -121,14 +112,12 @@ variables:
   script:
     - Set-Variable -name SKIP_DOWNLOAD -value "0"
     - !reference [.download_dependency_openvpn_dco, script]
-    - !reference [.download_dependency_qt_static, script]
     - !reference [.download_dependency_wintun, script]
     - !reference [.download_dependency_wireguard, script]
     - !reference [.download_dependency_wstunnel, script]
 
 .download_dependencies_posix:
   script:
-    - !reference [.download_dependency_qt, script]
     - !reference [.download_dependency_wireguard, script]
     - !reference [.download_dependency_wstunnel, script]
     - !reference [.download_vcpkg_cache, script]
@@ -146,14 +135,12 @@ variables:
   variables:
     GIT_STRATEGY: clone
     VCPKG_ROOT: '%VCPKG_ROOT_WINDOWS%'
-    VCPKG_DEFAULT_BINARY_CACHE: '%VCPKG_DEFAULT_BINARY_CACHE_WINDOWS%'
   script:
     # Backup OS identifier/build libs values.  Set flags to get the x86 Qt libs if on arm64.
     - Set-Variable -name OS_IDENTIFIER_BAK -value "${OS_IDENTIFIER}"
     - Set-Variable -name BUILD_LIBS_FOLDER_BAK -value "${BUILD_LIBS_FOLDER}"
     - if ("${ARCH_FLAG}" -eq "--arm64") { Set-Variable -name OS_IDENTIFIER -value "windows"; Set-Variable -name BUILD_LIBS_FOLDER -value "build-libs" }
     - if ("${ARCH_FLAG}" -ne "--arm64") { Set-Variable -name SKIP_DOWNLOAD -value "1" }
-    - !reference [.download_dependency_qt_static, script]
     - IF(Test-Path .\$BUILD_LIBS_FOLDER\) {Get-ChildItem .\$BUILD_LIBS_FOLDER\*.zip | Foreach {.\tools\bin\7z.exe x $_.FullName -o"$BUILD_LIBS_FOLDER\"}}
     # Reset to original values
     - Set-Variable -name OS_IDENTIFIER -value "${OS_IDENTIFIER_BAK}"
@@ -421,7 +408,6 @@ build:win:arm64:mr:
     # Need the x64 Qt package so we can reference it as the QT_HOST_PATH in build_all.
     - Set-Variable -name OS_IDENTIFIER -value "windows"
     - Set-Variable -name BUILD_LIBS_FOLDER -value "build-libs"
-    - !reference [.download_dependency_qt_static, script]
     - 'IF(Test-Path .\$BUILD_LIBS_FOLDER\) {Get-ChildItem .\$BUILD_LIBS_FOLDER\*.zip | Foreach {.\tools\bin\7z.exe x $_.FullName -o"$BUILD_LIBS_FOLDER\"}}'
     - Set-Variable -name OS_IDENTIFIER -value "windows-arm64"
     - Set-Variable -name BUILD_LIBS_FOLDER -value "build-libs-arm64"
@@ -528,7 +514,7 @@ build:aarch64_ubuntu:installer:
   script:
     - OS_IDENTIFIER="linux-arm64"
     - !reference [.build_linux_installer_common, script]
-    - tools/build_all --ci-mode --sign --build-deb --build-rpm
+    - tools/build_all --ci-mode --sign --arm64 --build-deb --build-rpm
     - curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem
       --upload-file build-exe/windscribe_${VERSION}_arm64.deb "${NEXUS_PATH_BRANCH_UPLOAD}/${OS_IDENTIFIER}/windscribe_${VERSION}_arm64.deb"
     - curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem
@@ -545,7 +531,7 @@ build:aarch64_ubuntu_cli:installer:
   script:
     - OS_IDENTIFIER="linux-arm64"
     - !reference [.build_linux_installer_common, script]
-    - tools/build_all --ci-mode --sign --build-cli-only --build-deb --build-rpm
+    - tools/build_all --ci-mode --sign --arm64 --build-cli-only --build-deb --build-rpm
     - curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem
       --upload-file build-exe/windscribe-cli_${VERSION}_arm64.deb "${NEXUS_PATH_BRANCH_UPLOAD}/${OS_IDENTIFIER}/windscribe-cli_${VERSION}_arm64.deb"
     - curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem
@@ -563,7 +549,7 @@ build:aarch64_ubuntu:installer:mr:
   script:
     - OS_IDENTIFIER="linux-arm64"
     - !reference [.build_linux_installer_common, script]
-    - tools/build_all --ci-mode --sign --build-deb --build-rpm
+    - tools/build_all --ci-mode --sign --arm64 --build-deb --build-rpm
   rules:
     - if: $BUILD_LINUX_ARM64 == "y" && $CI_COMMIT_TAG == null && $CI_COMMIT_BRANCH == null && $NIGHTLY_TEST_BUILD != "y"
 
@@ -575,7 +561,7 @@ build:aarch64_ubuntu_cli:installer:mr:
   script:
     - OS_IDENTIFIER="linux-arm64"
     - !reference [.build_linux_installer_common, script]
-    - tools/build_all --ci-mode --sign --build-cli-only --build-deb --build-rpm
+    - tools/build_all --ci-mode --sign --arm64 --build-cli-only --build-deb --build-rpm
   rules:
     - if: $BUILD_LINUX_ARM64 == "y" && $BUILD_LINUX_CLI == "y" && $CI_COMMIT_TAG == null && $CI_COMMIT_BRANCH == null && $NIGHTLY_TEST_BUILD != "y"
 
@@ -587,7 +573,7 @@ build:aarch64_ubuntu:installer:tagged:
   script:
     - OS_IDENTIFIER="linux-arm64"
     - !reference [.build_linux_installer_common, script]
-    - tools/build_all --ci-mode --sign --build-deb --build-rpm
+    - tools/build_all --ci-mode --sign --arm64 --build-deb --build-rpm
     - VERSION_NO_SUFFIX=$(python3 tools/base/extract.py --no-suffix)
     - if [[ $CI_COMMIT_TAG =~ ^v[0-9] ]]; then TAG=${CI_COMMIT_TAG:1}; else TAG=${CI_COMMIT_TAG}; fi
     - curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem
@@ -605,7 +591,7 @@ build:aarch64_ubuntu_cli:installer:tagged:
   script:
     - OS_IDENTIFIER="linux-arm64"
     - !reference [.build_linux_installer_common, script]
-    - tools/build_all --ci-mode --sign --build-cli-only --build-deb --build-rpm
+    - tools/build_all --ci-mode --sign --arm64 --build-cli-only --build-deb --build-rpm
     - VERSION_NO_SUFFIX=$(python3 tools/base/extract.py --no-suffix)
     - if [[ $CI_COMMIT_TAG =~ ^v[0-9] ]]; then TAG=${CI_COMMIT_TAG:1}; else TAG=${CI_COMMIT_TAG}; fi
     - curl --silent --show-error --fail -u "${NEXUS_USERNAME}:${NEXUS_PASSWORD}" --cacert tools/cacert.pem

README.md

@@ -39,15 +39,12 @@ The Windscribe VPN desktop application hides your physical location, blocks ads
 - Windows 10/11 x86_64.  We do not currently support building on the WoA (arm64) platform.
 - Install [git](https://git-scm.com/downloads). When installing Git, you can stick with all the default options presented to you by the installer.
 - Clone the repository.
-- Install Visual Studio Community Edition 2019 (run `install_vs.bat` from `/tools/prepare_build_environment/windows`).
+- Install Visual Studio Community Edition 2022.
 - Install Python 3 via either the Microsoft Store or from [here](https://www.python.org/downloads/). Minimum tested version is 3.6.8.
 - Install CMake v3.28.x or newer from [here](https://cmake.org/download/). The project will build with older versions of CMake, but you may encounter some warnings.
 - Install Ninja v1.10.2 from [here](https://github.com/ninja-build/ninja/releases)
 - Install Windows 11 SDK (10.0.22000) from [here](https://go.microsoft.com/fwlink/?linkid=2173743).  Newer versions may work as well.
-- Install vcpkg from [here](https://vcpkg.io/en/getting-started.html)
-    - Create a `VCPKG_ROOT` environment variable referencing the full path to your vcpkg install folder.
-    - Go to the vcpkg directory and `git checkout 52fc0d8c1e2cbd12c9907284566f5c17e5ef0d12`.
-    - Do the bootstrap step after the above command.
+- Install vcpkg using the script `/tools/vcpkg/install_ci/vcpkg_install.bat`
 - Verify the following entries are in your System `PATH` environment variable. If they are not, add them to the System `PATH` environment variable and reboot.
     - `C:\Program Files\Git\cmd`
     - `C:\[folder containing ninja.exe]`
@@ -88,7 +85,6 @@ pip install "cython<3.0.0" && pip install --no-build-isolation pyyaml==6.0
 Go to subfolder `tools/deps` and run the following scripts in order. Append `--arm64` to the command to build a library for Windows arm64. Libraries will be placed in `build-libs[-arm64]`.
 
 ```
-install_qt
 install_openvpn_dco
 install_wintun
 install_wireguard
@@ -147,10 +143,7 @@ See `build_all --help` for other build options.
 ```
 
 - Install CMake v3.28.x or newer from [here](https://cmake.org/download/) and make sure that the cmake executable is in the path and available for execution. The project will build with older versions of CMake, but you may encounter some warnings.
-- Install vcpkg from [here](https://vcpkg.io/en/getting-started.html)
-    - Create a `VCPKG_ROOT` environment variable referencing the full path to your vcpkg install folder.
-    - Go to the vcpkg directory and `git checkout 52fc0d8c1e2cbd12c9907284566f5c17e5ef0d12`.
-    - Do the bootstrap step after the above command.
+- Install vcpkg using the script `/tools/vcpkg/install_ci/vcpkg_install.sh`
 - Clone the repository.
 - Install python deps:
 ```python
@@ -167,7 +160,6 @@ See `build_all --help` for other build options.
 Go to subfolder `tools/deps` and run the following scripts in order. Libraries will be placed in `build-libs`.
 
 ```
-install_qt
 install_wireguard
 install_wstunnel
 ```
@@ -200,7 +192,7 @@ The repository contains Dockerfile to simplify building process. Skip all the ot
 ```
 - Install vcpkg:
 ```bash
-  sudo docker run --rm -v .:/w ws-builder /bin/bash -c "git clone https://github.com/Microsoft/vcpkg.git && cd vcpkg && git checkout 52fc0d8c1e2cbd12c9907284566f5c17e5ef0d12 && ./bootstrap-vcpkg.sh --disableMetrics"
+  sudo docker run --rm -v .:/w ws-builder /bin/bash -c "git clone https://github.com/Microsoft/vcpkg.git && cd vcpkg && git checkout 576379156e82da642f8d1834220876759f13534d && ./bootstrap-vcpkg.sh --disableMetrics"
 ```
 - Build all the dependencies:
 ```bash
@@ -224,10 +216,7 @@ Build process tested on Ubuntu 22.04/24.04.
   # Make sure that the cmake executable is in the path and available for execution.
   sudo snap install cmake --classic
 ```
-- Install vcpkg from [here](https://vcpkg.io/en/getting-started.html)
-    - Create a `VCPKG_ROOT` environment variable referencing the full path to your vcpkg install folder.
-    - Go to the vcpkg directory and `git checkout 52fc0d8c1e2cbd12c9907284566f5c17e5ef0d12`.
-    - Do the bootstrap step after the above command.
+- Install vcpkg using the script `/tools/vcpkg/install_ci/vcpkg_install.sh`
 - Install golang (minimum version 1.23): follow instructions from `https://go.dev/doc/install`
 - Clone the repository.
 - Install Python (if necessary) and Python deps.  You may want to use a virtual environment for Python (e.g. with pyenv), but this is up to you (and possibly your distribution).  We recommend 3.11 or later.
@@ -237,10 +226,9 @@ Build process tested on Ubuntu 22.04/24.04.
 
 ### Build libraries
 
-Go to subfolder `tools/deps` and run the following scripts in order. Libraries will be placed in `build-libs`. When building Qt6, you may encounter an error relating to `check_for_ulimit`. If so, downgrade to CMake version 3.24.
+Go to subfolder `tools/deps` and run the following scripts in order. Libraries will be placed in `build-libs`.
 
 ```
-install_qt
 install_wireguard
 install_wstunnel
 ```

backend/linux/helper/server.cpp

@@ -30,7 +30,7 @@ Server::Server()
 
 Server::~Server()
 {
-    service_.stop();
+    io_context_.stop();
 
     if (acceptor_) {
         delete acceptor_;
@@ -46,7 +46,7 @@ bool Server::readAndHandleCommand(socket_ptr sock, boost::asio::streambuf *buf,
         return false;
     }
 
-    const char *bufPtr = boost::asio::buffer_cast<const char*>(buf->data());
+    const char *bufPtr = static_cast<const char*>(buf->data().data());
     size_t headerSize = 0;
     int cmdId;
     memcpy(&cmdId, bufPtr + headerSize, sizeof(cmdId));
@@ -127,7 +127,7 @@ void Server::acceptHandler(const boost::system::error_code & ec, socket_ptr sock
 
 void Server::startAccept()
 {
-    socket_ptr sock(new boost::asio::local::stream_protocol::socket(service_));
+    socket_ptr sock(new boost::asio::local::stream_protocol::socket(io_context_));
     acceptor_->async_accept(*sock, boost::bind(&Server::acceptHandler, this, boost::asio::placeholders::error, sock));
 }
 
@@ -180,7 +180,7 @@ void Server::run()
     ::unlink(SOCK_PATH);
 
     boost::asio::local::stream_protocol::endpoint ep(SOCK_PATH);
-    acceptor_ = new boost::asio::local::stream_protocol::acceptor(service_, ep);
+    acceptor_ = new boost::asio::local::stream_protocol::acceptor(io_context_, ep);
 
 
 #ifdef NDEBUG
@@ -203,5 +203,5 @@ void Server::run()
 
     startAccept();
 
-    service_.run();
+    io_context_.run();
 }

backend/linux/helper/server.h

@@ -24,7 +24,7 @@ class Server
     void run();
 
 private:
-    boost::asio::io_service service_;
+    boost::asio::io_context io_context_;
     boost::asio::local::stream_protocol::acceptor *acceptor_;
 
     bool readAndHandleCommand(socket_ptr sock, boost::asio::streambuf *buf, std::string &outCmdAnswer);

backend/linux/helper/split_tunneling/hostnames_manager/dns_resolver.cpp

@@ -5,25 +5,25 @@ using namespace wsnet;
 
 DnsResolver::DnsResolver(std::function<void (std::map<std::string, HostInfo>)> resolveDomainsCallback) :
     resolveDomainsCallback_(resolveDomainsCallback),
-    work_(boost::asio::make_work_guard(io_service_))
+    work_(boost::asio::make_work_guard(io_context_))
 {
     if (!WSNet::initialize("", "", "", "", "", "", false, "en", "")) {
         spdlog::error("WSNet::initialize failed");
     }
 
-    thread_ = std::thread([this](){ io_service_.run(); });
+    thread_ = std::thread([this](){ io_context_.run(); });
 }
 
 DnsResolver::~DnsResolver()
 {
-    io_service_.stop();
+    io_context_.stop();
     thread_.join();
     WSNet::cleanup();
 }
 
 void DnsResolver::onDnsResolved(uint64_t requestId, const std::string &hostname, std::shared_ptr<wsnet::WSNetDnsRequestResult> result)
 {
-    boost::asio::post(io_service_,[this, requestId, hostname, result] {
+    boost::asio::post(io_context_,[this, requestId, hostname, result] {
         auto request = activeRequests_.find(requestId);
         if (request == activeRequests_.end())
             return;
@@ -45,7 +45,7 @@ void DnsResolver::onDnsResolved(uint64_t requestId, const std::string &hostname,
             }
             // repeat failed requests if the timeout allows, after 500 ms
             if (bWasFailedRequests && sinceHelper(startTime_).count() < kMaxTimeoutMs) {
-                timer_.emplace(boost::asio::deadline_timer(io_service_, boost::posix_time::millisec(kRetryTimeoutMs)));
+                timer_.emplace(boost::asio::deadline_timer(io_context_, boost::posix_time::millisec(kRetryTimeoutMs)));
                 timer_->async_wait(std::bind(&DnsResolver::onTimer, this, std::placeholders::_1));
             } else {
                 resolveDomainsCallback_(results_);
@@ -78,7 +78,7 @@ void DnsResolver::resolveDomains(const std::vector<std::string> &hostnames)
     timer_.reset();
     cancelAll();
 
-    boost::asio::post(io_service_, [this, hostnames] {
+    boost::asio::post(io_context_, [this, hostnames] {
         startTime_ = std::chrono::steady_clock::now();
         for (const auto &hostname : hostnames) {
             using namespace std::placeholders;
@@ -91,7 +91,7 @@ void DnsResolver::resolveDomains(const std::vector<std::string> &hostnames)
 
 void DnsResolver::cancelAll()
 {
-    boost::asio::post(io_service_, [this] {
+    boost::asio::post(io_context_, [this] {
         for (auto &request : activeRequests_)
             request.second->cancel();
         activeRequests_.clear();

backend/linux/helper/split_tunneling/hostnames_manager/dns_resolver.h

@@ -43,7 +43,7 @@ class DnsResolver
     static constexpr int kRetryTimeoutMs = 500;
 
     std::function<void(std::map<std::string, HostInfo>)> resolveDomainsCallback_;
-    boost::asio::io_service io_service_;
+    boost::asio::io_context io_context_;
     boost::asio::executor_work_guard<boost::asio::io_context::executor_type> work_;
     std::optional<boost::asio::deadline_timer> timer_;
     std::thread thread_;

backend/mac/helper/helper-info.plist

@@ -9,7 +9,7 @@
     <key>CFBundleName</key>
     <string>WindscribeHelper</string>
     <key>CFBundleVersion</key>
-    <string>97</string>
+    <string>98</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright © 2024 Windscribe Limited. All rights reserved.</string>
     <key>LSMinimumSystemVersion</key>

backend/windows/windscribe_install_helper/CMakeLists.txt

@@ -4,12 +4,6 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64")
-    set(VCPKG_TARGET_TRIPLET arm64-windows-static)
-else()
-    set(VCPKG_TARGET_TRIPLET x64-windows-static)
-endif()
-
 add_definitions(-DUNICODE -D_UNICODE)
 
 project(install_helper)

backend/windows/windscribe_service/CMakeLists.txt

@@ -5,13 +5,11 @@ set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64")
-    set(VCPKG_TARGET_TRIPLET arm64-windows-static)
     set(WINDSCRIBE_BUILD_LIBS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-libs-arm64)
 else()
-    set(VCPKG_TARGET_TRIPLET x64-windows-static)
     set(WINDSCRIBE_BUILD_LIBS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../build-libs)
 endif()