Fix: no username autocapitalization (https://trello.com/c/T2ot7oWb)

.github/workflows/deploy.yml

@@ -14,8 +14,8 @@ jobs:
     runs-on: ubuntu-20.04
 
     env:
-      QT_VERSION: 6.6.2
-      QIF_VERSION: 4.7
+      QT_VERSION: 6.5.1
+      QIF_VERSION: 4.6
 
     steps:
     - name: 'Install Qt'
@@ -72,8 +72,8 @@ jobs:
     runs-on: windows-latest
 
     env:
-      QT_VERSION: 6.6.2
-      QIF_VERSION: 4.7
+      QT_VERSION: 6.5.1
+      QIF_VERSION: 4.6
       BUILD_ARCH: 64
 
     steps:
@@ -134,7 +134,7 @@ jobs:
     runs-on: macos-13
 
     env:
-      QT_VERSION: 6.6.2
+      QT_VERSION: 6.5.2
       CC: cc
       CXX: c++
 
@@ -245,15 +245,10 @@ jobs:
         modules: 'qtremoteobjects qt5compat qtshadertools'
         dir: ${{ runner.temp }}
         setup-python: 'true'
+        tools: 'tools_ifw'
         set-env: 'true'
         extra: '--external 7z --base ${{ env.QT_MIRROR }}'
 
-    - name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}'
-      run: |
-        mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework
-        wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip
-        unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/
-
     - name: 'Get sources'
       uses: actions/checkout@v4
       with:
@@ -291,7 +286,7 @@ jobs:
 
     env:
       ANDROID_BUILD_PLATFORM: android-34
-      QT_VERSION: 6.6.2
+      QT_VERSION: 6.6.1
       QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
 
     steps:

.gitignore

@@ -131,6 +131,3 @@ client/3rd/ShadowSocks/ss_ios.xcconfig
 
 # UML generated pics
 out/
-
-# CMake files
-CMakeFiles/

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
 
-project(${PROJECT} VERSION 4.4.2.1
+project(${PROJECT} VERSION 4.4.0.0
         DESCRIPTION "AmneziaVPN"
         HOMEPAGE_URL "https://amnezia.org/"
 )
@@ -11,7 +11,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")
 
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 49)
+set(APP_ANDROID_VERSION_CODE 46)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")

README.md

@@ -7,15 +7,13 @@
 Amnezia is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.
 
 ## Features
-
-- Very easy to use - enter your IP address, SSH login, and password, and Amnezia will automatically install VPN docker containers to your server and connect to the VPN.
-- OpenVPN, ShadowSocks, WireGuard, and IKEv2 protocols support.
+- Very easy to use - enter your ip address, ssh login and password, and Amnezia will automatically install VPN docker containers to your server and connect to VPN.
+- OpenVPN, ShadowSocks, WireGuard, IKEv2 protocols support.
 - Masking VPN with OpenVPN over Cloak plugin
-- Split tunneling support - add any sites to the client to enable VPN only for them (only for desktops)
+- Split tunneling support - add any sites to client to enable VPN only for them (only for desktops)
 - Windows, MacOS, Linux, Android, iOS releases.
 
 ## Links
-
 [https://amnezia.org](https://amnezia.org) - project website  
 [https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
 [https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English)  
@@ -23,13 +21,13 @@ Amnezia is an open-source VPN client, with a key feature that enables you to dep
 
 ## Tech
 
-AmneziaVPN uses several open-source projects to work:
+AmneziaVPN uses a number of open source projects to work:
 
 - [OpenSSL](https://www.openssl.org/)
 - [OpenVPN](https://openvpn.net/)
 - [ShadowSocks](https://shadowsocks.org/)
 - [Qt](https://www.qt.io/)
-- [LibSsh](https://libssh.org) - forked from Qt Creator
+- [LibSsh](https://libssh.org) - forked form Qt Creator
 - and more...
 
 ## Checking out the source code
@@ -45,15 +43,14 @@ git submodule update --init --recursive
 Want to contribute? Welcome!
 
 ### Building sources and deployment
+Look deploy folder for build scripts. 
 
-Check deploy folder for build scripts. 
-
-### How to build an iOS app from source code on MacOS
+### How to build iOS app from source code on MacOS
 
 1. First, make sure you have [XCode](https://developer.apple.com/xcode/) installed, at least version 14 or higher.
 
-2. We use QT to generate the XCode project. We need QT version 6.6.1. Install QT for MacOS [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
-   - MacOS
+2. We use QT to generate the XCode project. we need QT version 6.6.1. Install QT for macos in [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
+   - macOS
    - iOS
    - Qt 5 Compatibility Module
    - Qt Shader Tools
@@ -62,18 +59,18 @@ Check deploy folder for build scripts.
      - Qt Multimedia
      - Qt Remote Objects 
 
-3. Install CMake if required. We recommend CMake version 3.25. You can install CMake [here](https://cmake.org/download/)
+3. Install cmake is require. We recommend cmake version 3.25. You can install cmake in [here](https://cmake.org/download/)
 
-4. You also need to install go >= v1.16. If you don't have it installed already,
+4. You also need to install go >= v1.16. If you don't have it done already,
 download go from the [official website](https://golang.org/dl/) or use Homebrew. 
-The latest version is recommended. Install gomobile
+Latest version is recommended. Install gomobile
 ```bash
 export PATH=$PATH:~/go/bin
 go install golang.org/x/mobile/cmd/gomobile@latest
 gomobile init
 ```
 
-5. Build the project
+5. Build project
 ```bash
 export QT_BIN_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/ios/bin"
 export QT_MACOS_ROOT_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/macos"
@@ -91,63 +88,62 @@ of the bin folder where gomobile was installed. Usually, it's in `GOPATH`.
 export PATH=$(PATH):/path/to/GOPATH/bin
 ```
 
-6. Open the XCode project. You can then run /test/archive/ship the app.
+5. Open XCode project. You can then run/test/archive/ship the app.
 
-If the build fails with the following error
+If build fails with the following error
 ```
 make: *** 
 [$(PROJECTDIR)/client/build/AmneziaVPN.build/Debug-iphoneos/wireguard-go-bridge/goroot/.prepared] 
 Error 1
 ```
-Add a user-defined variable to both AmneziaVPN and WireGuardNetworkExtension targets' build settings with
+Add a user defined variable to both AmneziaVPN and WireGuardNetworkExtension targets' build settings with
 key `PATH` and value `${PATH}/path/to/bin/folder/with/go/executable`, e.g. `${PATH}:/usr/local/go/bin`.
 
-if the above error persists on your M1 Mac, then most probably you need to install arch based CMake 
+if above error still persists on you M1 Mac, then most probably you need to install arch based cmake 
 ```
 arch -arm64 brew install cmake
 ```
 
-Build might fail with the "source files not found" error the first time you try it, because the modern XCode build system compiles dependencies in parallel, and some dependencies end up being built after the ones that
-require them. In this case, simply restart the build.
+Build might fail with "source files not found" error the first time you try it, because modern XCode build system compiles
+dependencies in parallel, and some dependencies end up being built after the ones that
+require them. In this case simply restart the build.
 
 ## How to build the Android app
-
-_Tested on Mac OS_
+_tested on Mac OS_
 
 The Android app has the following requirements:
 * JDK 11
 * Android platform SDK 33
-* CMake 3.25.0
+* cmake 3.25.0
 
-After you have installed QT, QT Creator, and Android Studio, you need to configure QT Creator correctly. Click in the top menu bar on `QT Creator` -> `Preferences` -> `Devices` and select the tab `Android`. 
-    * set path to JDK 11
+After you have installed QT, QT Creator and Android Studio installed, you need to configure QT Creator correctly. Click in the top menu bar on `QT Creator` -> `Preferences` -> `Devices` and select the tab `Android`. 
+    * set path to jdk 11
     * set path to Android SDK ($ANDROID_HOME)
 
-In case you get errors regarding missing SDK or 'SDK manager not running', you cannot fix them by correcting the paths. If you have some spare GBs on your disk, you can let QT Creator install all requirements by choosing an empty folder for `Android SDK location` and clicking on `Set Up SDK`. Be aware: This will install a second Android SDK and NDK on your machine! 
-Double-check that the right CMake version is configured:  Click on `QT Creator` -> `Preferences` and click on the side menu on `Kits`. Under the center content view's `Kits` tab, you'll find an entry for `CMake Tool`. If the default selected CMake version is lower than 3.25.0, install on your system CMake >= 3.25.0 and choose `System CMake at <path>` from the drop-down list. If this entry is missing, you either have not installed CMake yet or QT Creator hasn't found the path to it. In that case, click in the preferences window on the side menu item `CMake`, then on the tab `Tools` in the center content view, and finally on the button `Add` to set the path to your installed CMake. 
-Please make sure that you have selected Android Platform SDK 33 for your project: click in the main view's side menu on `Projects`, and on the left, you'll see a section `Build & Run` showing different Android build targets. You can select any of them, Amnezia VPN's project setup is designed in a way that all Android targets will be built. Click on the targets submenu item `Build` and scroll in the center content view to `Build Steps`. Click on `Details` at the end of the headline `Build Android APK` (the `Details` button might be hidden in case the QT Creator Window is not running in full screen!). Here we are: Choose `android-33` as `Android Build Platform SDK`.
+In case you get errors regarding missing SDK or 'sdkmanager not running', you cannot fix them by correcting the paths and you have some spare GBs on your disk, you can let QT Creator install all requirements by choosing an empty folder for `Android SDK location` and click on `Set Up SDK`. Be aware: This will install a second Android SDK and NDK on your machine! 
 
-That's it! You should be ready to compile the project from QT Creator!
+Double check that the right cmake version is configured:  Click on `QT Creator` -> `Preferences` and click on the side menu on `Kits`. Under the center content view's `Kits` tab you'll find an entry `CMake Tool`. If the default selected CMake version is lower than 3.25.0, install on your system CMake >= 3.25.0 and choose `System CMake at <path>` from the drop down list. If this entry is missing, you either have not installed CMake yet or QT Creator hasn't found the path to it. In that case click in the preferences window on the side menu item `CMake`, then on the tab `Tools`in the center content view and finally on the Button `Add` to set the path to your installed CMake. 
+
+Please make sure that you have selected Android Platform SDK 33 for your project: click in the main view's side menu on on `Projects`, on the left you'll see a section `Build & Run` showing different Android build targets. You can select any of them, Amnezia VPN's project setup is designed in a way that always all Android targets will be build. Click on the targets submenu item `Build` and scroll in the center content view to `Build Steps`. Click on `Details` at the end of the headline `Build Android APK` (The `Details` button might be hidden in case QT Creator Window is not running in full screen!). Here we are: choose `android-33` as `Android Build platform SDK`.
+
+That's it you should be ready to compile the project from QT Creator!
 
 ### Development flow
+After you've hit the build button, QT-Creator copies the whole project to a folder in the repositories parent directory. The folder should look something like `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>`.
+If you want to develop Amnezia VPNs Android components written in Kotlin, such as components using system APIs, you need to import the generated project in Android Studio with `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>/client/android-build` as the projects root directory. While you should be able to compile the generated project from Android Studio, you cannot work directly in the repository's Android project. So whenever you are confident with your work in the generated project, you'll need to copy and paste the affected files to the corresponding path in the repositories Android project so that you can add and commit your changes!
 
-After you've hit the build button, QT-Creator copies the whole project to a folder in the repository parent directory. The folder should look something like `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>`.
-If you want to develop Amnezia VPNs Android components written in Kotlin, such as components using system APIs, you need to import the generated project in Android Studio with `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>/client/android-build` as the projects root directory. While you should be able to compile the generated project from Android Studio, you cannot work directly in the repository's Android project. So whenever you are confident with your work in the generated project, you'll need to copy and paste the affected files to the corresponding path in the repository's Android project so that you can add and commit your changes!
-
-You may face compiling issues in QT Creator after you've worked in Android Studio on the generated project. Just do a `./gradlew clean` in the generated project's root directory (`<path>/client/android-build/.`) and you should be good to go.
+You may face compiling issues in QT Creator after you've worked in Android Studio on the generated project. Just do a `./gradlew clean` in the generated project's root directory (`<path>/client/android-build/.`) and you should be good to continue.
 
 ## License
-
-GPL v3.0
+GPL v.3
 
 ## Donate
-
 Bitcoin: bc1qn9rhsffuxwnhcuuu4qzrwp4upkrq94xnh8r26u  
 XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3  
 payeer.com: P2561305  
 ko-fi.com: [https://ko-fi.com/amnezia_vpn](https://ko-fi.com/amnezia_vpn)  
 
-## Acknowledgments
 
+## etc
 This project is tested with BrowserStack.
 We express our gratitude to [BrowserStack](https://www.browserstack.com) for supporting our project.

client/CMakeLists.txt

@@ -15,15 +15,6 @@ set(PACKAGES
     Core5Compat Concurrent LinguistTools
 )
 
-execute_process(
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  COMMAND git rev-parse --short HEAD
-  OUTPUT_VARIABLE GIT_COMMIT_HASH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
-
 if(IOS)
     set(PACKAGES ${PACKAGES} Multimedia)
 endif()
@@ -67,7 +58,6 @@ set(AMNEZIAVPN_TS_FILES
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_zh_CN.ts
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_fa_IR.ts
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ar.ts
-    ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_my_MM.ts
 )
 
 file(GLOB_RECURSE AMNEZIAVPN_TS_SOURCES *.qrc *.cpp *.h *.ui)

client/amnezia_application.cpp

@@ -24,7 +24,6 @@
 
 #if defined(Q_OS_IOS)
     #include "platforms/ios/ios_controller.h"
-    #include <AmneziaVPN-Swift.h>
 #endif
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
@@ -96,18 +95,7 @@ void AmneziaApplication::init()
         qFatal("Android logging initialization failed");
     }
     AndroidController::instance()->setSaveLogs(m_settings->isSaveLogs());
-    connect(m_settings.get(), &Settings::saveLogsChanged,
-            AndroidController::instance(), &AndroidController::setSaveLogs);
-
-    AndroidController::instance()->setScreenshotsEnabled(m_settings->isScreenshotsEnabled());
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged,
-            AndroidController::instance(), &AndroidController::setScreenshotsEnabled);
-
-    connect(m_settings.get(), &Settings::serverRemoved,
-            AndroidController::instance(), &AndroidController::resetLastServer);
-
-    connect(m_settings.get(), &Settings::settingsCleared,
-            [](){ AndroidController::instance()->resetLastServer(-1); });
+    connect(m_settings.get(), &Settings::saveLogsChanged, AndroidController::instance(), &AndroidController::setSaveLogs);
 
     connect(AndroidController::instance(), &AndroidController::initConnectionState, this,
             [this](Vpn::ConnectionState state) {
@@ -139,14 +127,6 @@ void AmneziaApplication::init()
         m_pageController->goToPageSettingsBackup();
         m_settingsController->importBackupFromOutside(filePath);
     });
-
-    QTimer::singleShot(0, this, [this](){
-        AmneziaVPN::toggleScreenshots(m_settings->isScreenshotsEnabled());
-    });
-
-    connect(m_settings.get(), &Settings::screenshotsEnabledChanged, [](bool enabled) {
-        AmneziaVPN::toggleScreenshots(enabled);
-    });
 #endif
 
     m_notificationHandler.reset(NotificationHandler::create(nullptr));
@@ -306,16 +286,10 @@ void AmneziaApplication::initModels()
     m_containersModel.reset(new ContainersModel(this));
     m_engine->rootContext()->setContextProperty("ContainersModel", m_containersModel.get());
 
-    m_defaultServerContainersModel.reset(new ContainersModel(this));
-    m_engine->rootContext()->setContextProperty("DefaultServerContainersModel", m_defaultServerContainersModel.get());
-
     m_serversModel.reset(new ServersModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("ServersModel", m_serversModel.get());
     connect(m_serversModel.get(), &ServersModel::containersUpdated, m_containersModel.get(),
             &ContainersModel::updateModel);
-    connect(m_serversModel.get(), &ServersModel::defaultServerContainersUpdated, m_defaultServerContainersModel.get(),
-            &ContainersModel::updateModel);
-    m_serversModel->resetModel();
 
     m_languageModel.reset(new LanguageModel(m_settings, this));
     m_engine->rootContext()->setContextProperty("LanguageModel", m_languageModel.get());
@@ -359,7 +333,7 @@ void AmneziaApplication::initModels()
     connect(m_configurator.get(), &VpnConfigurator::newVpnConfigCreated, this,
             [this](const QString &clientId, const QString &clientName, const DockerContainer container,
                    ServerCredentials credentials) {
-                m_serversModel->reloadDefaultServerContainerConfig();
+                m_serversModel->reloadContainerConfig();
                 m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
                 emit m_configurator->clientModelUpdated();
             });

client/amnezia_application.h

@@ -92,7 +92,6 @@ private:
     QCommandLineParser m_parser;
 
     QSharedPointer<ContainersModel> m_containersModel;
-    QSharedPointer<ContainersModel> m_defaultServerContainersModel;
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<LanguageModel> m_languageModel;
     QSharedPointer<ProtocolsModel> m_protocolsModel;

client/android/AndroidManifest.xml

@@ -56,10 +56,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
-            </intent-filter>
-
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="-- %%INSERT_APP_LIB_NAME%% --" />
@@ -150,22 +146,6 @@
             </intent-filter>
         </service>
 
-        <service
-            android:name=".AmneziaTileService"
-            android:process=":amneziaTileService"
-            android:icon="@drawable/ic_amnezia_round"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
-            android:exported="true">
-
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                android:value="true" />
-        </service>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="org.amnezia.vpn.qtprovider"

client/android/awg/src/main/kotlin/Awg.kt

@@ -64,7 +64,7 @@ class Awg : Wireguard() {
         val configDataJson = config.getJSONObject("awg_config_data")
         val configData = parseConfigData(configDataJson.getString("config"))
         return AwgConfig.build {
-            configWireguard(configData, configDataJson)
+            configWireguard(configData)
             configSplitTunneling(config)
             configData["Jc"]?.let { setJc(it.toInt()) }
             configData["Jmin"]?.let { setJmin(it.toInt()) }

client/android/build.gradle.kts

@@ -111,5 +111,4 @@ dependencies {
     implementation(libs.kotlinx.coroutines)
     implementation(libs.bundles.androidx.camera)
     implementation(libs.google.mlkit)
-    implementation(libs.androidx.datastore)
 }

client/android/gradle/libs.versions.toml

@@ -6,7 +6,6 @@ androidx-activity = "1.8.1"
 androidx-annotation = "1.7.0"
 androidx-camera = "1.3.0"
 androidx-security-crypto = "1.1.0-alpha06"
-androidx-datastore = "1.1.0-beta01"
 kotlinx-coroutines = "1.7.3"
 google-mlkit = "17.2.0"
 
@@ -19,7 +18,6 @@ androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.r
 androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "androidx-camera" }
 androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "androidx-camera" }
 androidx-security-crypto = { module = "androidx.security:security-crypto-ktx", version.ref = "androidx-security-crypto" }
-androidx-datastore = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
 google-mlkit = { module = "com.google.mlkit:barcode-scanning", version.ref = "google-mlkit" }
 

client/android/protocolApi/src/main/kotlin/ProtocolState.kt

@@ -2,9 +2,9 @@ package org.amnezia.vpn.protocol
 
 // keep synchronized with client/platforms/android/android_controller.h ConnectionState
 enum class ProtocolState {
-    DISCONNECTED,
     CONNECTED,
     CONNECTING,
+    DISCONNECTED,
     DISCONNECTING,
     RECONNECTING,
     UNKNOWN

client/android/protocolApi/src/main/kotlin/Status.kt

@@ -28,10 +28,6 @@ fun Bundle.putStatus(status: Status) {
     putInt(STATE_KEY, status.state.ordinal)
 }
 
-fun Bundle.putStatus(state: ProtocolState) {
-    putInt(STATE_KEY, state.ordinal)
-}
-
 fun Bundle.getStatus(): Status =
     Status.build {
         setState(ProtocolState.entries[getInt(STATE_KEY)])

client/android/res/values-ru/strings.xml

@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="connecting">Подключение</string>
-    <string name="disconnecting">Отключение</string>
-</resources>

client/android/res/values/strings.xml

@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="connecting">Connecting</string>
-    <string name="disconnecting">Disconnecting</string>
-</resources>

client/android/src/org/amnezia/vpn/AmneziaActivity.kt

@@ -14,7 +14,6 @@ import android.os.IBinder
 import android.os.Looper
 import android.os.Message
 import android.os.Messenger
-import android.view.WindowManager.LayoutParams
 import android.webkit.MimeTypeMap
 import android.widget.Toast
 import androidx.annotation.MainThread
@@ -27,7 +26,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.amnezia.vpn.protocol.ProtocolState
 import org.amnezia.vpn.protocol.getStatistics
 import org.amnezia.vpn.protocol.getStatus
 import org.amnezia.vpn.qt.QtAndroidController
@@ -35,11 +36,11 @@ import org.amnezia.vpn.util.Log
 import org.qtproject.qt.android.bindings.QtActivity
 
 private const val TAG = "AmneziaActivity"
-const val ACTIVITY_MESSENGER_NAME = "Activity"
 
 private const val CHECK_VPN_PERMISSION_ACTION_CODE = 1
 private const val CREATE_FILE_ACTION_CODE = 2
 private const val OPEN_FILE_ACTION_CODE = 3
+private const val BIND_SERVICE_TIMEOUT = 1000L
 
 class AmneziaActivity : QtActivity() {
 
@@ -57,17 +58,25 @@ class AmneziaActivity : QtActivity() {
                 val event = msg.extractIpcMessage<ServiceEvent>()
                 Log.d(TAG, "Handle event: $event")
                 when (event) {
-                    ServiceEvent.STATUS_CHANGED -> {
-                        msg.data?.getStatus()?.let { (state) ->
-                            Log.d(TAG, "Handle protocol state: $state")
-                            QtAndroidController.onVpnStateChanged(state.ordinal)
-                        }
+                    ServiceEvent.CONNECTED -> {
+                        QtAndroidController.onVpnConnected()
+                    }
+
+                    ServiceEvent.DISCONNECTED -> {
+                        QtAndroidController.onVpnDisconnected()
+                        doUnbindService()
+                    }
+
+                    ServiceEvent.RECONNECTING -> {
+                        QtAndroidController.onVpnReconnecting()
                     }
 
                     ServiceEvent.STATUS -> {
                         if (isWaitingStatus) {
                             isWaitingStatus = false
-                            msg.data?.getStatus()?.let { QtAndroidController.onStatus(it) }
+                            msg.data?.getStatus()?.let { (state) ->
+                                QtAndroidController.onStatus(state.ordinal)
+                            }
                         }
                     }
 
@@ -78,7 +87,7 @@ class AmneziaActivity : QtActivity() {
                     }
 
                     ServiceEvent.ERROR -> {
-                        msg.data?.getString(MSG_ERROR)?.let { error ->
+                        msg.data?.getString(ERROR_MSG)?.let { error ->
                             Log.e(TAG, "From VpnService: $error")
                         }
                         // todo: add error reporting to Qt
@@ -100,15 +109,14 @@ class AmneziaActivity : QtActivity() {
                 // get a messenger from the service to send actions to the service
                 vpnServiceMessenger.set(Messenger(service))
                 // send a messenger to the service to process service events
-                vpnServiceMessenger.send(
-                    Action.REGISTER_CLIENT.packToMessage {
-                        putString(MSG_CLIENT_NAME, ACTIVITY_MESSENGER_NAME)
-                    },
-                    replyTo = activityMessenger
-                )
+                vpnServiceMessenger.send {
+                    Action.REGISTER_CLIENT.packToMessage().apply {
+                        replyTo = activityMessenger
+                    }
+                }
                 isServiceConnected = true
                 if (isWaitingStatus) {
-                    vpnServiceMessenger.send(Action.REQUEST_STATUS, replyTo = activityMessenger)
+                    vpnServiceMessenger.send(Action.REQUEST_STATUS)
                 }
             }
 
@@ -118,7 +126,6 @@ class AmneziaActivity : QtActivity() {
                 vpnServiceMessenger.reset()
                 isWaitingStatus = true
                 QtAndroidController.onServiceDisconnected()
-                doBindService()
             }
 
             override fun onBindingDied(name: ComponentName?) {
@@ -141,11 +148,8 @@ class AmneziaActivity : QtActivity() {
         Log.d(TAG, "Create Amnezia activity: $intent")
         mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
         vpnServiceMessenger = IpcMessenger(
-            "VpnService",
-            onDeadObjectException = {
-                doUnbindService()
-                doBindService()
-            }
+            onDeadObjectException = ::doUnbindService,
+            messengerName = "VpnService"
         )
         intent?.let(::processIntent)
     }
@@ -240,9 +244,10 @@ class AmneziaActivity : QtActivity() {
     private fun doBindService() {
         Log.d(TAG, "Bind service")
         Intent(this, AmneziaVpnService::class.java).also {
-            bindService(it, serviceConnection, BIND_ABOVE_CLIENT and BIND_AUTO_CREATE)
+            bindService(it, serviceConnection, BIND_ABOVE_CLIENT)
         }
         isInBoundState = true
+        handleBindTimeout()
     }
 
     @MainThread
@@ -251,14 +256,26 @@ class AmneziaActivity : QtActivity() {
             Log.d(TAG, "Unbind service")
             isWaitingStatus = true
             QtAndroidController.onServiceDisconnected()
-            isServiceConnected = false
-            vpnServiceMessenger.send(Action.UNREGISTER_CLIENT, activityMessenger)
             vpnServiceMessenger.reset()
+            isServiceConnected = false
             isInBoundState = false
             unbindService(serviceConnection)
         }
     }
 
+    private fun handleBindTimeout() {
+        mainScope.launch {
+            if (isWaitingStatus) {
+                delay(BIND_SERVICE_TIMEOUT)
+                if (isWaitingStatus && !isServiceConnected) {
+                    Log.d(TAG, "Bind timeout, reset connection status")
+                    isWaitingStatus = false
+                    QtAndroidController.onStatus(ProtocolState.DISCONNECTED.ordinal)
+                }
+            }
+        }
+    }
+
     /**
      * Methods of starting and stopping VpnService
      */
@@ -295,7 +312,7 @@ class AmneziaActivity : QtActivity() {
         Log.d(TAG, "Connect to VPN")
         vpnServiceMessenger.send {
             Action.CONNECT.packToMessage {
-                putString(MSG_VPN_CONFIG, vpnConfig)
+                putString(VPN_CONFIG, vpnConfig)
             }
         }
     }
@@ -303,7 +320,7 @@ class AmneziaActivity : QtActivity() {
     private fun startVpnService(vpnConfig: String) {
         Log.d(TAG, "Start VPN service")
         Intent(this, AmneziaVpnService::class.java).apply {
-            putExtra(MSG_VPN_CONFIG, vpnConfig)
+            putExtra(VPN_CONFIG, vpnConfig)
         }.also {
             ContextCompat.startForegroundService(this, it)
         }
@@ -352,22 +369,6 @@ class AmneziaActivity : QtActivity() {
         }
     }
 
-    @Suppress("unused")
-    fun resetLastServer(index: Int) {
-        Log.v(TAG, "Reset server: $index")
-        mainScope.launch {
-            VpnStateStore.store {
-                if (index == -1 || it.serverIndex == index) {
-                    VpnState.defaultState
-                } else if (it.serverIndex > index) {
-                    it.copy(serverIndex = it.serverIndex - 1)
-                } else {
-                    it
-                }
-            }
-        }
-    }
-
     @Suppress("unused")
     fun saveFile(fileName: String, data: String) {
         Log.d(TAG, "Save file $fileName")
@@ -437,7 +438,7 @@ class AmneziaActivity : QtActivity() {
             Log.saveLogs = enabled
             vpnServiceMessenger.send {
                 Action.SET_SAVE_LOGS.packToMessage {
-                    putBoolean(MSG_SAVE_LOGS, enabled)
+                    putBoolean(SAVE_LOGS, enabled)
                 }
             }
         }
@@ -454,13 +455,4 @@ class AmneziaActivity : QtActivity() {
         Log.v(TAG, "Clear logs")
         Log.clearLogs()
     }
-
-    @Suppress("unused")
-    fun setScreenshotsEnabled(enabled: Boolean) {
-        Log.v(TAG, "Set screenshots enabled: $enabled")
-        mainScope.launch {
-            val flag = if (enabled) 0 else LayoutParams.FLAG_SECURE
-            window.setFlags(flag, LayoutParams.FLAG_SECURE)
-        }
-    }
 }

client/android/src/org/amnezia/vpn/AmneziaApplication.kt

@@ -18,7 +18,6 @@ class AmneziaApplication : QtApplication(), CameraXConfig.Provider {
         super.onCreate()
         Prefs.init(this)
         Log.init(this)
-        VpnStateStore.init(this)
         Log.d(TAG, "Create Amnezia application")
         createNotificationChannel()
     }

client/android/src/org/amnezia/vpn/AmneziaTileService.kt

@@ -1,272 +0,0 @@
-package org.amnezia.vpn
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Intent
-import android.content.ServiceConnection
-import android.net.VpnService
-import android.os.Build
-import android.os.IBinder
-import android.os.Messenger
-import android.service.quicksettings.Tile
-import android.service.quicksettings.TileService
-import androidx.core.content.ContextCompat
-import kotlin.LazyThreadSafetyMode.NONE
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.CONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.RECONNECTING
-import org.amnezia.vpn.protocol.ProtocolState.UNKNOWN
-import org.amnezia.vpn.util.Log
-
-private const val TAG = "AmneziaTileService"
-private const val DEFAULT_TILE_LABEL = "AmneziaVPN"
-
-class AmneziaTileService : TileService() {
-
-    private lateinit var scope: CoroutineScope
-    private var vpnStateListeningJob: Job? = null
-    private lateinit var vpnServiceMessenger: IpcMessenger
-
-    @Volatile
-    private var isServiceConnected = false
-    private var isInBoundState = false
-    @Volatile
-    private var isVpnConfigExists = false
-
-    private val serviceConnection: ServiceConnection by lazy(NONE) {
-        object : ServiceConnection {
-            override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-                Log.d(TAG, "Service ${name?.flattenToString()} was connected")
-                vpnServiceMessenger.set(Messenger(service))
-                isServiceConnected = true
-            }
-
-            override fun onServiceDisconnected(name: ComponentName?) {
-                Log.w(TAG, "Service ${name?.flattenToString()} was unexpectedly disconnected")
-                isServiceConnected = false
-                vpnServiceMessenger.reset()
-                updateVpnState(DISCONNECTED)
-            }
-
-            override fun onBindingDied(name: ComponentName?) {
-                Log.w(TAG, "Binding to the ${name?.flattenToString()} unexpectedly died")
-                doUnbindService()
-                doBindService()
-            }
-        }
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        Log.d(TAG, "Create Amnezia Tile Service")
-        scope = CoroutineScope(SupervisorJob())
-        vpnServiceMessenger = IpcMessenger(
-            "VpnService",
-            onDeadObjectException = ::doUnbindService
-        )
-    }
-
-    override fun onDestroy() {
-        Log.d(TAG, "Destroy Amnezia Tile Service")
-        doUnbindService()
-        scope.cancel()
-        super.onDestroy()
-    }
-
-    // Workaround for some bugs
-    override fun onBind(intent: Intent?): IBinder? =
-        try {
-            super.onBind(intent)
-        } catch (e: Throwable) {
-            Log.e(TAG, "Failed to bind AmneziaTileService: $e")
-            null
-        }
-
-    override fun onStartListening() {
-        super.onStartListening()
-        Log.d(TAG, "Start listening")
-        if (AmneziaVpnService.isRunning(applicationContext)) {
-            Log.d(TAG, "Vpn service is running")
-            doBindService()
-        } else {
-            Log.d(TAG, "Vpn service is not running")
-            isServiceConnected = false
-            updateVpnState(DISCONNECTED)
-        }
-        vpnStateListeningJob = launchVpnStateListening()
-    }
-
-    override fun onStopListening() {
-        Log.d(TAG, "Stop listening")
-        vpnStateListeningJob?.cancel()
-        vpnStateListeningJob = null
-        doUnbindService()
-        super.onStopListening()
-    }
-
-    override fun onClick() {
-        Log.d(TAG, "onClick")
-        if (isLocked) {
-            unlockAndRun { onClickInternal() }
-        } else {
-            onClickInternal()
-        }
-    }
-
-    private fun onClickInternal() {
-        if (isVpnConfigExists) {
-            Log.d(TAG, "Change VPN state")
-            if (qsTile.state == Tile.STATE_INACTIVE) {
-                Log.d(TAG, "Start VPN")
-                updateVpnState(CONNECTING)
-                startVpn()
-            } else if (qsTile.state == Tile.STATE_ACTIVE) {
-                Log.d(TAG, "Stop vpn")
-                updateVpnState(DISCONNECTING)
-                stopVpn()
-            }
-        } else {
-            Log.d(TAG, "Start Activity")
-            Intent(this, AmneziaActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }.also {
-                startActivityAndCollapseCompat(it)
-            }
-        }
-    }
-
-    private fun doBindService() {
-        Log.d(TAG, "Bind service")
-        Intent(this, AmneziaVpnService::class.java).also {
-            bindService(it, serviceConnection, BIND_ABOVE_CLIENT)
-        }
-        isInBoundState = true
-    }
-
-    private fun doUnbindService() {
-        if (isInBoundState) {
-            Log.d(TAG, "Unbind service")
-            isServiceConnected = false
-            vpnServiceMessenger.reset()
-            isInBoundState = false
-            unbindService(serviceConnection)
-        }
-    }
-
-    private fun startVpn() {
-        if (isServiceConnected) {
-            connectToVpn()
-        } else {
-            if (checkPermission()) {
-                startVpnService()
-                doBindService()
-            } else {
-                updateVpnState(DISCONNECTED)
-            }
-        }
-    }
-
-    private fun checkPermission() =
-        if (VpnService.prepare(applicationContext) != null) {
-            Intent(this, VpnRequestActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }.also {
-                startActivityAndCollapseCompat(it)
-            }
-            false
-        } else {
-            true
-        }
-
-    private fun startVpnService() =
-        ContextCompat.startForegroundService(
-            applicationContext,
-            Intent(this, AmneziaVpnService::class.java)
-        )
-
-    private fun connectToVpn() = vpnServiceMessenger.send(Action.CONNECT)
-
-    private fun stopVpn() = vpnServiceMessenger.send(Action.DISCONNECT)
-
-    @SuppressLint("StartActivityAndCollapseDeprecated")
-    private fun startActivityAndCollapseCompat(intent: Intent) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            startActivityAndCollapse(
-                PendingIntent.getActivity(
-                    applicationContext,
-                    0,
-                    intent,
-                    PendingIntent.FLAG_IMMUTABLE
-                )
-            )
-        } else {
-            @Suppress("DEPRECATION")
-            startActivityAndCollapse(intent)
-        }
-    }
-
-    private fun updateVpnState(state: ProtocolState) {
-        scope.launch {
-            VpnStateStore.store { it.copy(protocolState = state) }
-        }
-    }
-
-    private fun launchVpnStateListening() =
-        scope.launch { VpnStateStore.dataFlow().collectLatest(::updateTile) }
-
-    private fun updateTile(vpnState: VpnState) {
-        Log.d(TAG, "Update tile: $vpnState")
-        isVpnConfigExists = vpnState.serverName != null
-        val tile = qsTile ?: return
-        tile.apply {
-            label = vpnState.serverName ?: DEFAULT_TILE_LABEL
-            when (vpnState.protocolState) {
-                CONNECTED -> {
-                    state = Tile.STATE_ACTIVE
-                    subtitleCompat = null
-                }
-
-                DISCONNECTED, UNKNOWN -> {
-                    state = Tile.STATE_INACTIVE
-                    subtitleCompat = null
-                }
-
-                CONNECTING, RECONNECTING -> {
-                    state = Tile.STATE_UNAVAILABLE
-                    subtitleCompat = resources.getString(R.string.connecting)
-                }
-
-                DISCONNECTING -> {
-                    state = Tile.STATE_UNAVAILABLE
-                    subtitleCompat = resources.getString(R.string.disconnecting)
-                }
-            }
-            updateTile()
-        }
-        // double update to fix weird visual glitches
-        tile.updateTile()
-    }
-
-    private var Tile.subtitleCompat: CharSequence?
-        set(value) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                this.subtitle = value
-            }
-        }
-        get() {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                return this.subtitle
-            }
-            return null
-        }
-}

client/android/src/org/amnezia/vpn/AmneziaVpnService.kt

@@ -1,10 +1,7 @@
 package org.amnezia.vpn
 
-import android.app.ActivityManager
-import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND_SERVICE
 import android.app.Notification
 import android.app.PendingIntent
-import android.content.Context
 import android.content.Intent
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MANIFEST
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED
@@ -19,7 +16,6 @@ import android.os.Process
 import androidx.annotation.MainThread
 import androidx.core.app.NotificationCompat
 import androidx.core.app.ServiceCompat
-import java.util.concurrent.ConcurrentHashMap
 import kotlin.LazyThreadSafetyMode.NONE
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
@@ -30,7 +26,6 @@ import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -44,11 +39,14 @@ import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
 import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.RECONNECTING
 import org.amnezia.vpn.protocol.ProtocolState.UNKNOWN
+import org.amnezia.vpn.protocol.Statistics
+import org.amnezia.vpn.protocol.Status
 import org.amnezia.vpn.protocol.VpnException
 import org.amnezia.vpn.protocol.VpnStartException
 import org.amnezia.vpn.protocol.awg.Awg
 import org.amnezia.vpn.protocol.cloak.Cloak
 import org.amnezia.vpn.protocol.openvpn.OpenVpn
+import org.amnezia.vpn.protocol.putStatistics
 import org.amnezia.vpn.protocol.putStatus
 import org.amnezia.vpn.protocol.wireguard.Wireguard
 import org.amnezia.vpn.util.Log
@@ -59,16 +57,12 @@ import org.json.JSONObject
 
 private const val TAG = "AmneziaVpnService"
 
-const val MSG_VPN_CONFIG = "VPN_CONFIG"
-const val MSG_ERROR = "ERROR"
-const val MSG_SAVE_LOGS = "SAVE_LOGS"
-const val MSG_CLIENT_NAME = "CLIENT_NAME"
+const val VPN_CONFIG = "VPN_CONFIG"
+const val ERROR_MSG = "ERROR_MSG"
+const val SAVE_LOGS = "SAVE_LOGS"
 
 const val AFTER_PERMISSION_CHECK = "AFTER_PERMISSION_CHECK"
 private const val PREFS_CONFIG_KEY = "LAST_CONF"
-private const val PREFS_SERVER_NAME = "LAST_SERVER_NAME"
-private const val PREFS_SERVER_INDEX = "LAST_SERVER_INDEX"
-private const val PROCESS_NAME = "org.amnezia.vpn:amneziaVpnService"
 private const val NOTIFICATION_ID = 1337
 private const val STATISTICS_SENDING_TIMEOUT = 1000L
 private const val DISCONNECT_TIMEOUT = 5000L
@@ -82,8 +76,6 @@ class AmneziaVpnService : VpnService() {
     private var protocol: Protocol? = null
     private val protocolCache = mutableMapOf<String, Protocol>()
     private var protocolState = MutableStateFlow(UNKNOWN)
-    private var serverName: String? = null
-    private var serverIndex: Int = -1
 
     private val isConnected
         get() = protocolState.value == CONNECTED
@@ -97,11 +89,8 @@ class AmneziaVpnService : VpnService() {
     private var connectionJob: Job? = null
     private var disconnectionJob: Job? = null
     private var statisticsSendingJob: Job? = null
+    private lateinit var clientMessenger: IpcMessenger
     private lateinit var networkState: NetworkState
-    private val clientMessengers = ConcurrentHashMap<Messenger, IpcMessenger>()
-
-    private val isActivityConnected
-        get() = clientMessengers.any { it.value.name == ACTIVITY_MESSENGER_NAME }
 
     private val connectionExceptionHandler = CoroutineExceptionHandler { _, e ->
         protocolState.value = DISCONNECTED
@@ -127,22 +116,13 @@ class AmneziaVpnService : VpnService() {
                 Log.d(TAG, "Handle action: $action")
                 when (action) {
                     Action.REGISTER_CLIENT -> {
-                        val clientName = msg.data.getString(MSG_CLIENT_NAME)
-                        val messenger = IpcMessenger(msg.replyTo, clientName)
-                        clientMessengers[msg.replyTo] = messenger
-                        Log.d(TAG, "Messenger client '$clientName' was registered")
-                        if (clientName == ACTIVITY_MESSENGER_NAME && isConnected) launchSendingStatistics()
-                    }
-
-                    Action.UNREGISTER_CLIENT -> {
-                        clientMessengers.remove(msg.replyTo)?.let {
-                            Log.d(TAG, "Messenger client '${it.name}' was unregistered")
-                            if (it.name == ACTIVITY_MESSENGER_NAME) stopSendingStatistics()
-                        }
+                        clientMessenger.set(msg.replyTo)
                     }
 
                     Action.CONNECT -> {
-                        connect(msg.data.getString(MSG_VPN_CONFIG))
+                        val vpnConfig = msg.data.getString(VPN_CONFIG)
+                        Prefs.save(PREFS_CONFIG_KEY, vpnConfig)
+                        connect(vpnConfig)
                     }
 
                     Action.DISCONNECT -> {
@@ -150,17 +130,17 @@ class AmneziaVpnService : VpnService() {
                     }
 
                     Action.REQUEST_STATUS -> {
-                        clientMessengers[msg.replyTo]?.let { clientMessenger ->
-                            clientMessenger.send {
-                                ServiceEvent.STATUS.packToMessage {
-                                    putStatus(this@AmneziaVpnService.protocolState.value)
-                                }
+                        clientMessenger.send {
+                            ServiceEvent.STATUS.packToMessage {
+                                putStatus(Status.build {
+                                    setState(this@AmneziaVpnService.protocolState.value)
+                                })
                             }
                         }
                     }
 
                     Action.SET_SAVE_LOGS -> {
-                        Log.saveLogs = msg.data.getBoolean(MSG_SAVE_LOGS)
+                        Log.saveLogs = msg.data.getBoolean(SAVE_LOGS)
                     }
                 }
             }
@@ -209,7 +189,7 @@ class AmneziaVpnService : VpnService() {
         Log.d(TAG, "Create Amnezia VPN service")
         mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
         connectionScope = CoroutineScope(SupervisorJob() + Dispatchers.IO + connectionExceptionHandler)
-        loadServerData()
+        clientMessenger = IpcMessenger(messengerName = "Client")
         launchProtocolStateHandler()
         networkState = NetworkState(this, ::reconnect)
     }
@@ -221,13 +201,15 @@ class AmneziaVpnService : VpnService() {
 
         if (isAlwaysOnCompat) {
             Log.d(TAG, "Start service via Always-on")
-            connect()
+            connect(Prefs.load(PREFS_CONFIG_KEY))
         } else if (intent?.getBooleanExtra(AFTER_PERMISSION_CHECK, false) == true) {
             Log.d(TAG, "Start service after permission check")
-            connect()
+            connect(Prefs.load(PREFS_CONFIG_KEY))
         } else {
             Log.d(TAG, "Start service")
-            connect(intent?.getStringExtra(MSG_VPN_CONFIG))
+            val vpnConfig = intent?.getStringExtra(VPN_CONFIG)
+            Prefs.save(PREFS_CONFIG_KEY, vpnConfig)
+            connect(vpnConfig)
         }
         ServiceCompat.startForeground(this, NOTIFICATION_ID, notification, foregroundServiceTypeCompat)
         return START_REDELIVER_INTENT
@@ -237,16 +219,17 @@ class AmneziaVpnService : VpnService() {
         Log.d(TAG, "onBind by $intent")
         if (intent?.action == SERVICE_INTERFACE) return super.onBind(intent)
         isServiceBound = true
+        if (isConnected) launchSendingStatistics()
         return vpnServiceMessenger.binder
     }
 
     override fun onUnbind(intent: Intent?): Boolean {
         Log.d(TAG, "onUnbind by $intent")
         if (intent?.action != SERVICE_INTERFACE) {
-            if (clientMessengers.isEmpty()) {
-                isServiceBound = false
-                if (isUnknown || isDisconnected) stopService()
-            }
+            isServiceBound = false
+            stopSendingStatistics()
+            clientMessenger.reset()
+            if (isUnknown || isDisconnected) stopService()
         }
         return true
     }
@@ -255,6 +238,7 @@ class AmneziaVpnService : VpnService() {
         Log.d(TAG, "onRebind by $intent")
         if (intent?.action != SERVICE_INTERFACE) {
             isServiceBound = true
+            if (isConnected) launchSendingStatistics()
         }
         super.onRebind(intent)
     }
@@ -294,16 +278,17 @@ class AmneziaVpnService : VpnService() {
      */
     private fun launchProtocolStateHandler() {
         mainScope.launch {
-            // drop first default UNKNOWN state
-            protocolState.drop(1).collect { protocolState ->
+            protocolState.collect { protocolState ->
                 Log.d(TAG, "Protocol state changed: $protocolState")
                 when (protocolState) {
                     CONNECTED -> {
+                        clientMessenger.send(ServiceEvent.CONNECTED)
                         networkState.bindNetworkListener()
-                        if (isActivityConnected) launchSendingStatistics()
+                        if (isServiceBound) launchSendingStatistics()
                     }
 
                     DISCONNECTED -> {
+                        clientMessenger.send(ServiceEvent.DISCONNECTED)
                         networkState.unbindNetworkListener()
                         stopSendingStatistics()
                         if (!isServiceBound) stopService()
@@ -315,19 +300,12 @@ class AmneziaVpnService : VpnService() {
                     }
 
                     RECONNECTING -> {
+                        clientMessenger.send(ServiceEvent.RECONNECTING)
                         stopSendingStatistics()
                     }
 
                     CONNECTING, UNKNOWN -> {}
                 }
-
-                clientMessengers.send {
-                    ServiceEvent.STATUS_CHANGED.packToMessage {
-                        putStatus(protocolState)
-                    }
-                }
-
-                VpnStateStore.store { VpnState(protocolState, serverName, serverIndex) }
             }
         }
     }
@@ -354,17 +332,7 @@ class AmneziaVpnService : VpnService() {
     }
 
     @MainThread
-    private fun connect(vpnConfig: String? = null) {
-        if (vpnConfig == null) {
-            connectToVpn(Prefs.load(PREFS_CONFIG_KEY))
-        } else {
-            Prefs.save(PREFS_CONFIG_KEY, vpnConfig)
-            connectToVpn(vpnConfig)
-        }
-    }
-
-    @MainThread
-    private fun connectToVpn(vpnConfig: String) {
+    private fun connect(vpnConfig: String?) {
         if (isConnected || protocolState.value == CONNECTING) return
 
         Log.d(TAG, "Start VPN connection")
@@ -372,7 +340,6 @@ class AmneziaVpnService : VpnService() {
         protocolState.value = CONNECTING
 
         val config = parseConfigToJson(vpnConfig)
-        saveServerData(config)
         if (config == null) {
             onError("Invalid VPN config")
             protocolState.value = DISCONNECTED
@@ -450,38 +417,24 @@ class AmneziaVpnService : VpnService() {
     private fun onError(msg: String) {
         Log.e(TAG, msg)
         mainScope.launch {
-            clientMessengers.send {
+            clientMessenger.send {
                 ServiceEvent.ERROR.packToMessage {
-                    putString(MSG_ERROR, msg)
+                    putString(ERROR_MSG, msg)
                 }
             }
         }
     }
 
-    private fun parseConfigToJson(vpnConfig: String): JSONObject? =
-        if (vpnConfig.isBlank()) {
-            null
-        } else {
-            try {
-                JSONObject(vpnConfig)
-            } catch (e: JSONException) {
-                onError("Invalid VPN config json format: ${e.message}")
-                null
+    private fun parseConfigToJson(vpnConfig: String?): JSONObject? =
+        try {
+            vpnConfig?.let {
+                JSONObject(it)
             }
+        } catch (e: JSONException) {
+            onError("Invalid VPN config json format: ${e.message}")
+            null
         }
 
-    private fun saveServerData(config: JSONObject?) {
-        serverName = config?.opt("description") as String?
-        serverIndex = config?.opt("serverIndex") as Int? ?: -1
-        Prefs.save(PREFS_SERVER_NAME, serverName)
-        Prefs.save(PREFS_SERVER_INDEX, serverIndex)
-    }
-
-    private fun loadServerData() {
-        serverName = Prefs.load<String>(PREFS_SERVER_NAME).ifBlank { null }
-        if (serverName != null) serverIndex = Prefs.load(PREFS_SERVER_INDEX)
-    }
-
     private fun checkPermission(): Boolean =
         if (prepare(applicationContext) != null) {
             Intent(this, VpnRequestActivity::class.java).apply {
@@ -493,12 +446,4 @@ class AmneziaVpnService : VpnService() {
         } else {
             true
         }
-
-    companion object {
-        fun isRunning(context: Context): Boolean =
-            (context.getSystemService(ACTIVITY_SERVICE) as ActivityManager)
-                .runningAppProcesses.any {
-                    it.processName == PROCESS_NAME && it.importance <= IMPORTANCE_FOREGROUND_SERVICE
-                }
-    }
 }

client/android/src/org/amnezia/vpn/IpcMessage.kt

@@ -20,7 +20,9 @@ sealed interface IpcMessage {
 }
 
 enum class ServiceEvent : IpcMessage {
-    STATUS_CHANGED,
+    CONNECTED,
+    DISCONNECTED,
+    RECONNECTING,
     STATUS,
     STATISTICS_UPDATE,
     ERROR
@@ -28,7 +30,6 @@ enum class ServiceEvent : IpcMessage {
 
 enum class Action : IpcMessage {
     REGISTER_CLIENT,
-    UNREGISTER_CLIENT,
     CONNECT,
     DISCONNECT,
     REQUEST_STATUS,

client/android/src/org/amnezia/vpn/IpcMessenger.kt

@@ -9,21 +9,11 @@ import org.amnezia.vpn.util.Log
 private const val TAG = "IpcMessenger"
 
 class IpcMessenger(
-    messengerName: String? = null,
     private val onDeadObjectException: () -> Unit = {},
-    private val onRemoteException: () -> Unit = {}
+    private val onRemoteException: () -> Unit = {},
+    private val messengerName: String = "Unknown"
 ) {
     private var messenger: Messenger? = null
-    val name = messengerName ?: "Unknown"
-
-    constructor(
-        messenger: Messenger,
-        messengerName: String? = null,
-        onDeadObjectException: () -> Unit = {},
-        onRemoteException: () -> Unit = {}
-    ) : this(messengerName, onDeadObjectException, onRemoteException) {
-        this.messenger = messenger
-    }
 
     fun set(messenger: Messenger) {
         this.messenger = messenger
@@ -35,29 +25,19 @@ class IpcMessenger(
 
     fun send(msg: () -> Message) = messenger?.sendMsg(msg())
 
-    fun send(msg: Message, replyTo: Messenger) = messenger?.sendMsg(msg.apply { this.replyTo = replyTo })
-
     fun <T> send(msg: T)
         where T : Enum<T>, T : IpcMessage = messenger?.sendMsg(msg.packToMessage())
 
-    fun <T> send(msg: T, replyTo: Messenger)
-        where T : Enum<T>, T : IpcMessage = messenger?.sendMsg(msg.packToMessage().apply { this.replyTo = replyTo })
-
     private fun Messenger.sendMsg(msg: Message) {
         try {
             send(msg)
         } catch (e: DeadObjectException) {
-            Log.w(TAG, "$name messenger is dead")
+            Log.w(TAG, "$messengerName messenger is dead")
             messenger = null
             onDeadObjectException()
         } catch (e: RemoteException) {
-            Log.w(TAG, "Sending a message to the $name messenger failed: ${e.message}")
+            Log.w(TAG, "Sending a message to the $messengerName messenger failed: ${e.message}")
             onRemoteException()
         }
     }
 }
-
-fun Map<Messenger, IpcMessenger>.send(msg: () -> Message) = this.values.forEach { it.send(msg) }
-
-fun <T> Map<Messenger, IpcMessenger>.send(msg: T)
-    where T : Enum<T>, T : IpcMessage = this.values.forEach { it.send(msg) }

client/android/src/org/amnezia/vpn/VpnState.kt

@@ -1,75 +0,0 @@
-package org.amnezia.vpn
-
-import android.app.Application
-import androidx.datastore.core.MultiProcessDataStoreFactory
-import androidx.datastore.core.Serializer
-import androidx.datastore.dataStoreFile
-import java.io.InputStream
-import java.io.ObjectInputStream
-import java.io.ObjectOutputStream
-import java.io.OutputStream
-import java.io.Serializable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.withContext
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.ProtocolState.DISCONNECTED
-import org.amnezia.vpn.util.Log
-
-private const val TAG = "VpnState"
-private const val STORE_FILE_NAME = "vpnState"
-
-data class VpnState(
-    val protocolState: ProtocolState,
-    val serverName: String? = null,
-    val serverIndex: Int = -1
-) : Serializable {
-    companion object {
-        private const val serialVersionUID: Long = -1760654961004181606
-        val defaultState: VpnState = VpnState(DISCONNECTED)
-    }
-}
-
-object VpnStateStore {
-    private lateinit var app: Application
-
-    private val dataStore = MultiProcessDataStoreFactory.create(
-        serializer = VpnStateSerializer(),
-        produceFile = { app.dataStoreFile(STORE_FILE_NAME) }
-    )
-
-    fun init(app: Application) {
-        Log.v(TAG, "Init VpnStateStore")
-        this.app = app
-    }
-
-    fun dataFlow(): Flow<VpnState> = dataStore.data
-
-    suspend fun store(f: (vpnState: VpnState) -> VpnState) {
-        try {
-            dataStore.updateData(f)
-        } catch (e : Exception) {
-            Log.e(TAG, "Failed to store VpnState: $e")
-        }
-    }
-}
-
-private class VpnStateSerializer : Serializer<VpnState> {
-    override val defaultValue: VpnState = VpnState.defaultState
-
-    override suspend fun readFrom(input: InputStream): VpnState {
-        return withContext(Dispatchers.IO) {
-            ObjectInputStream(input).use {
-                it.readObject() as VpnState
-            }
-        }
-    }
-
-    override suspend fun writeTo(t: VpnState, output: OutputStream) {
-        withContext(Dispatchers.IO) {
-            ObjectOutputStream(output).use {
-                it.writeObject(t)
-            }
-        }
-    }
-}

client/android/src/org/amnezia/vpn/qt/QtAndroidController.kt

@@ -1,23 +1,18 @@
 package org.amnezia.vpn.qt
 
-import org.amnezia.vpn.protocol.ProtocolState
-import org.amnezia.vpn.protocol.Status
-
 /**
  * JNI functions of the AndroidController class from android_controller.cpp,
  * called by events in the Android part of the client
  */
 object QtAndroidController {
-
-    fun onStatus(status: Status) = onStatus(status.state)
-    fun onStatus(protocolState: ProtocolState) = onStatus(protocolState.ordinal)
-
     external fun onStatus(stateCode: Int)
     external fun onServiceDisconnected()
     external fun onServiceError()
 
     external fun onVpnPermissionRejected()
-    external fun onVpnStateChanged(stateCode: Int)
+    external fun onVpnConnected()
+    external fun onVpnDisconnected()
+    external fun onVpnReconnecting()
     external fun onStatisticsUpdate(rxBytes: Long, txBytes: Long)
 
     external fun onFileOpened(uri: String)

client/android/wireguard/src/main/kotlin/GoBackend.kt

@@ -0,0 +1,10 @@
+package org.amnezia.vpn.protocol.wireguard
+
+object GoBackend {
+    external fun wgGetConfig(handle: Int): String?
+    external fun wgGetSocketV4(handle: Int): Int
+    external fun wgGetSocketV6(handle: Int): Int
+    external fun wgTurnOff(handle: Int)
+    external fun wgTurnOn(ifName: String, tunFd: Int, settings: String): Int
+    external fun wgVersion(): String
+}

client/android/wireguard/src/main/kotlin/Wireguard.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.net.VpnService.Builder
 import java.util.TreeMap
 import kotlinx.coroutines.flow.MutableStateFlow
-import org.amnezia.awg.GoBackend
 import org.amnezia.vpn.protocol.Protocol
 import org.amnezia.vpn.protocol.ProtocolState
 import org.amnezia.vpn.protocol.ProtocolState.CONNECTED
@@ -62,7 +61,7 @@ open class Wireguard : Protocol() {
     override val statistics: Statistics
         get() {
             if (tunnelHandle == -1) return Statistics.EMPTY_STATISTICS
-            val config = GoBackend.awgGetConfig(tunnelHandle) ?: return Statistics.EMPTY_STATISTICS
+            val config = GoBackend.wgGetConfig(tunnelHandle) ?: return Statistics.EMPTY_STATISTICS
             return Statistics.build {
                 var optsCount = 0
                 config.splitToSequence("\n").forEach { line ->
@@ -93,12 +92,12 @@ open class Wireguard : Protocol() {
         val configDataJson = config.getJSONObject("wireguard_config_data")
         val configData = parseConfigData(configDataJson.getString("config"))
         return WireguardConfig.build {
-            configWireguard(configData, configDataJson)
+            configWireguard(configData)
             configSplitTunneling(config)
         }
     }
 
-    protected fun WireguardConfig.Builder.configWireguard(configData: Map<String, String>, configDataJson: JSONObject) {
+    protected fun WireguardConfig.Builder.configWireguard(configData: Map<String, String>) {
         configData["Address"]?.split(",")?.map { address ->
             InetNetwork.parse(address.trim())
         }?.forEach(::addAddress)
@@ -119,14 +118,7 @@ open class Wireguard : Protocol() {
         if (routes.any { it !in defRoutes }) disableSplitTunneling()
         addRoutes(routes)
 
-        configDataJson.optString("mtu").let { mtu ->
-            if (mtu.isNotEmpty()) {
-                setMtu(mtu.toInt())
-            } else {
-                configData["MTU"]?.let { setMtu(it.toInt()) }
-            }
-        }
-
+        configData["MTU"]?.let { setMtu(it.toInt()) }
         configData["Endpoint"]?.let { setEndpoint(InetEndpoint.parse(it)) }
         configData["PersistentKeepalive"]?.let { setPersistentKeepalive(it.toInt()) }
         configData["PrivateKey"]?.let { setPrivateKeyHex(it.base64ToHex()) }
@@ -157,8 +149,8 @@ open class Wireguard : Protocol() {
             if (tunFd == null) {
                 throw VpnStartException("Create VPN interface: permission not granted or revoked")
             }
-            Log.v(TAG, "Wg-go backend ${GoBackend.awgVersion()}")
-            tunnelHandle = GoBackend.awgTurnOn(ifName, tunFd.detachFd(), config.toWgUserspaceString())
+            Log.v(TAG, "Wg-go backend ${GoBackend.wgVersion()}")
+            tunnelHandle = GoBackend.wgTurnOn(ifName, tunFd.detachFd(), config.toWgUserspaceString())
         }
 
         if (tunnelHandle < 0) {
@@ -166,8 +158,8 @@ open class Wireguard : Protocol() {
             throw VpnStartException("Wireguard tunnel creation error")
         }
 
-        if (!protect(GoBackend.awgGetSocketV4(tunnelHandle)) || !protect(GoBackend.awgGetSocketV6(tunnelHandle))) {
-            GoBackend.awgTurnOff(tunnelHandle)
+        if (!protect(GoBackend.wgGetSocketV4(tunnelHandle)) || !protect(GoBackend.wgGetSocketV6(tunnelHandle))) {
+            GoBackend.wgTurnOff(tunnelHandle)
             tunnelHandle = -1
             throw VpnStartException("Protect VPN interface: permission not granted or revoked")
         }
@@ -180,7 +172,7 @@ open class Wireguard : Protocol() {
         }
         val handleToClose = tunnelHandle
         tunnelHandle = -1
-        GoBackend.awgTurnOff(handleToClose)
+        GoBackend.wgTurnOff(handleToClose)
         state.value = DISCONNECTED
     }
 

client/android/wireguard/src/main/kotlin/org/amnezia/awg/GoBackend.kt

@@ -1,10 +0,0 @@
-package org.amnezia.awg
-
-object GoBackend {
-    external fun awgGetConfig(handle: Int): String?
-    external fun awgGetSocketV4(handle: Int): Int
-    external fun awgGetSocketV6(handle: Int): Int
-    external fun awgTurnOff(handle: Int)
-    external fun awgTurnOn(ifName: String, tunFd: Int, settings: String): Int
-    external fun awgVersion(): String
-}

client/cmake/android.cmake

@@ -45,12 +45,13 @@ foreach(abi IN ITEMS ${QT_ANDROID_ABIS})
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg-go.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/amneziawg/android/${abi}/libwg-quick.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/shadowsocks/android/${abi}/libredsocks.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/shadowsocks/android/${abi}/libsslocal.so
+        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/shadowsocks/android/${abi}/libtun2socks.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libck-ovpn-plugin.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpn3.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/libovpnutil.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openvpn/android/${abi}/librsapss.so
         ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/libssh/android/${abi}/libssh.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl3/android/${abi}/libcrypto_3.so
-        ${CMAKE_CURRENT_SOURCE_DIR}/3rd-prebuilt/3rd-prebuilt/openssl3/android/${abi}/libssl_3.so
     )
 endforeach()

client/cmake/ios.cmake

@@ -107,7 +107,6 @@ target_sources(${PROJECT} PRIVATE
     ${CLIENT_ROOT_DIR}/platforms/ios/LogController.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/ScreenProtection.swift
 )
 
 target_sources(${PROJECT} PRIVATE

client/configurators/awg_configurator.cpp

@@ -41,8 +41,6 @@ QString AwgConfigurator::genAwgConfig(const ServerCredentials &credentials, Dock
     jsonConfig[config_key::responsePacketMagicHeader] = configMap.value(config_key::responsePacketMagicHeader);
     jsonConfig[config_key::underloadPacketMagicHeader] = configMap.value(config_key::underloadPacketMagicHeader);
     jsonConfig[config_key::transportPacketMagicHeader] = configMap.value(config_key::transportPacketMagicHeader);
-    jsonConfig[config_key::mtu] = containerConfig.value(ProtocolProps::protoToString(Proto::Awg)).toObject().
-                                  value(config_key::mtu).toString(protocols::awg::defaultMtu);
 
     return QJsonDocument(jsonConfig).toJson();
 }

client/configurators/openvpn_configurator.cpp

@@ -76,7 +76,7 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::prepareOpenVpnConfig(co
 
     if (connData.caCert.isEmpty() || connData.clientCert.isEmpty() || connData.taKey.isEmpty()) {
         if (errorCode)
-            *errorCode = ErrorCode::SshScpFailureError;
+            *errorCode = ErrorCode::SshSftpFailureError;
     }
 
     return connData;

client/configurators/wireguard_configurator.cpp

@@ -159,7 +159,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
                                  .arg(connData.clientPubKey, connData.pskKey, connData.clientIP);
 
     e = serverController.uploadTextFileToContainer(container, credentials, configPart, m_serverConfigPath,
-                                                   libssh::ScpOverwriteMode::ScpAppendToExisting);
+                                                   libssh::SftpOverwriteMode::SftpAppendToExisting);
 
     if (e) {
         if (errorCode)
@@ -194,7 +194,6 @@ QString WireguardConfigurator::genWireguardConfig(const ServerCredentials &crede
     config.replace("$WIREGUARD_SERVER_PUBLIC_KEY", connData.serverPubKey);
     config.replace("$WIREGUARD_PSK", connData.pskKey);
 
-    const QJsonObject &wireguarConfig = containerConfig.value(ProtocolProps::protoToString(Proto::WireGuard)).toObject();
     QJsonObject jConfig;
     jConfig[config_key::config] = config;
 
@@ -206,8 +205,6 @@ QString WireguardConfigurator::genWireguardConfig(const ServerCredentials &crede
     jConfig[config_key::psk_key] = connData.pskKey;
     jConfig[config_key::server_pub_key] = connData.serverPubKey;
 
-    jConfig[config_key::mtu] = wireguarConfig.value(config_key::mtu).toString(protocols::wireguard::defaultMtu);
-
     clientId = connData.clientPubKey;
 
     return QJsonDocument(jConfig).toJson();

client/core/controllers/serverController.cpp

@@ -118,7 +118,7 @@ ServerController::runContainerScript(const ServerCredentials &credentials, Docke
 
 ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container, const ServerCredentials &credentials,
                                                       const QString &file, const QString &path,
-                                                      libssh::ScpOverwriteMode overwriteMode)
+                                                      libssh::SftpOverwriteMode overwriteMode)
 {
     ErrorCode e = ErrorCode::NoError;
     QString tmpFileName = QString("/tmp/%1.tmp").arg(Utils::getRandomString(16));
@@ -139,7 +139,7 @@ ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container,
     if (e)
         return e;
 
-    if (overwriteMode == libssh::ScpOverwriteMode::ScpOverwriteExisting) {
+    if (overwriteMode == libssh::SftpOverwriteMode::SftpOverwriteExisting) {
         e = runScript(credentials,
                       replaceVars(QString("sudo docker cp %1 $CONTAINER_NAME:/%2").arg(tmpFileName).arg(path),
                                   genVarsForScript(credentials, container)),
@@ -147,7 +147,7 @@ ErrorCode ServerController::uploadTextFileToContainer(DockerContainer container,
 
         if (e)
             return e;
-    } else if (overwriteMode == libssh::ScpOverwriteMode::ScpAppendToExisting) {
+    } else if (overwriteMode == libssh::SftpOverwriteMode::SftpAppendToExisting) {
         e = runScript(credentials,
                       replaceVars(QString("sudo docker cp %1 $CONTAINER_NAME:/%2").arg(tmpFileName).arg(tmpFileName),
                                   genVarsForScript(credentials, container)),
@@ -199,7 +199,7 @@ QByteArray ServerController::getTextFileFromContainer(DockerContainer container,
 }
 
 ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data,
-                                             const QString &remotePath, libssh::ScpOverwriteMode overwriteMode)
+                                             const QString &remotePath, libssh::SftpOverwriteMode overwriteMode)
 {
     auto error = m_sshClient.connectToHost(credentials);
     if (error != ErrorCode::NoError) {
@@ -211,7 +211,7 @@ ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credential
     localFile.write(data);
     localFile.close();
 
-    error = m_sshClient.scpFileCopy(overwriteMode, localFile.fileName(), remotePath, "non_desc");
+    error = m_sshClient.sftpFileCopy(overwriteMode, localFile.fileName(), remotePath, "non_desc");
 
     if (error != ErrorCode::NoError) {
         return error;
@@ -359,33 +359,7 @@ bool ServerController::isReinstallContainerRequired(DockerContainer container, c
     }
 
     if (container == DockerContainer::Awg) {
-        if ((oldProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort)
-            != newProtoConfig.value(config_key::port).toString(protocols::awg::defaultPort))
-            || (oldProtoConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount)
-                != newProtoConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount))
-            || (oldProtoConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize)
-                != newProtoConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize))
-            || (oldProtoConfig.value(config_key::junkPacketMaxSize).toString(protocols::awg::defaultJunkPacketMaxSize)
-                != newProtoConfig.value(config_key::junkPacketMaxSize).toString(protocols::awg::defaultJunkPacketMaxSize))
-            || (oldProtoConfig.value(config_key::initPacketJunkSize).toString(protocols::awg::defaultInitPacketJunkSize)
-                != newProtoConfig.value(config_key::initPacketJunkSize).toString(protocols::awg::defaultInitPacketJunkSize))
-            || (oldProtoConfig.value(config_key::responsePacketJunkSize).toString(protocols::awg::defaultResponsePacketJunkSize)
-                != newProtoConfig.value(config_key::responsePacketJunkSize).toString(protocols::awg::defaultResponsePacketJunkSize))
-            || (oldProtoConfig.value(config_key::initPacketMagicHeader).toString(protocols::awg::defaultInitPacketMagicHeader)
-                != newProtoConfig.value(config_key::initPacketMagicHeader).toString(protocols::awg::defaultInitPacketMagicHeader))
-            || (oldProtoConfig.value(config_key::responsePacketMagicHeader).toString(protocols::awg::defaultResponsePacketMagicHeader)
-                != newProtoConfig.value(config_key::responsePacketMagicHeader).toString(protocols::awg::defaultResponsePacketMagicHeader))
-            || (oldProtoConfig.value(config_key::underloadPacketMagicHeader).toString(protocols::awg::defaultUnderloadPacketMagicHeader)
-                != newProtoConfig.value(config_key::underloadPacketMagicHeader).toString(protocols::awg::defaultUnderloadPacketMagicHeader))
-            || (oldProtoConfig.value(config_key::transportPacketMagicHeader).toString(protocols::awg::defaultTransportPacketMagicHeader)
-                != newProtoConfig.value(config_key::transportPacketMagicHeader).toString(protocols::awg::defaultTransportPacketMagicHeader)))
-            return true;
-    }
-
-    if (container == DockerContainer::WireGuard){
-        if (oldProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort)
-            != newProtoConfig.value(config_key::port).toString(protocols::wireguard::defaultPort))
-            return true;
+        return true;
     }
 
     return false;

client/core/controllers/serverController.h

@@ -38,7 +38,7 @@ public:
 
     ErrorCode uploadTextFileToContainer(
             DockerContainer container, const ServerCredentials &credentials, const QString &file, const QString &path,
-            libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);
+            libssh::SftpOverwriteMode overwriteMode = libssh::SftpOverwriteMode::SftpOverwriteExisting);
     QByteArray getTextFileFromContainer(DockerContainer container, const ServerCredentials &credentials,
                                         const QString &path, ErrorCode *errorCode = nullptr);
 
@@ -80,7 +80,7 @@ private:
     ErrorCode isServerDpkgBusy(const ServerCredentials &credentials, DockerContainer container);
 
     ErrorCode uploadFileToHost(const ServerCredentials &credentials, const QByteArray &data, const QString &remotePath,
-                               libssh::ScpOverwriteMode overwriteMode = libssh::ScpOverwriteMode::ScpOverwriteExisting);
+                               libssh::SftpOverwriteMode overwriteMode = libssh::SftpOverwriteMode::SftpOverwriteExisting);
 
     ErrorCode setupServerFirewall(const ServerCredentials &credentials);
 

client/core/defs.h

@@ -46,12 +46,25 @@ namespace amnezia
         SshPrivateKeyFormatError = 304,
         SshTimeoutError = 305,
 
-        // Ssh scp errors
-        SshScpFailureError = 400,
+        // Ssh sftp errors
+        SshSftpEofError = 400,
+        SshSftpNoSuchFileError = 401,
+        SshSftpPermissionDeniedError = 402,
+        SshSftpFailureError = 403,
+        SshSftpBadMessageError = 404,
+        SshSftpNoConnectionError = 405,
+        SshSftpConnectionLostError = 406,
+        SshSftpOpUnsupportedError = 407,
+        SshSftpInvalidHandleError = 408,
+        SshSftpNoSuchPathError = 409,
+        SshSftpFileAlreadyExistsError = 410,
+        SshSftpWriteProtectError = 411,
+        SshSftpNoMediaError = 412,
 
         // Local errors
         OpenVpnConfigMissing = 500,
         OpenVpnManagementServerError = 501,
+        ConfigMissing = 502,
 
         // Distro errors
         OpenVpnExecutableMissing = 600,
@@ -79,15 +92,7 @@ namespace amnezia
 
         // Api errors
         ApiConfigDownloadError = 1100,
-        ApiConfigAlreadyAdded = 1101,
-
-        // QFile errors
-        OpenError = 1200,
-        ReadError = 1201,
-        PermissionsError = 1202,
-        UnspecifiedError = 1203,
-        FatalError = 1204,
-        AbortError = 1205
+        ApiConfigAlreadyAdded = 1101
     };
 
 } // namespace amnezia

client/core/errorstrings.cpp

@@ -28,8 +28,20 @@ QString errorString(ErrorCode code) {
     case(SshPrivateKeyFormatError): errorMessage = QObject::tr("The selected private key format is not supported, use openssh ED25519 key types or PEM key types"); break;
     case(SshTimeoutError): errorMessage = QObject::tr("Timeout connecting to server"); break;
 
-    // Ssh scp errors
-    case(SshScpFailureError): errorMessage = QObject::tr("Scp error: Generic failure"); break;
+    // Libssh sftp errors
+    case(SshSftpEofError): errorMessage = QObject::tr("Sftp error: End-of-file encountered"); break;
+    case(SshSftpNoSuchFileError): errorMessage = QObject::tr("Sftp error: File does not exist"); break;
+    case(SshSftpPermissionDeniedError): errorMessage = QObject::tr("Sftp error: Permission denied"); break;
+    case(SshSftpFailureError): errorMessage = QObject::tr("Sftp error: Generic failure"); break;
+    case(SshSftpBadMessageError): errorMessage = QObject::tr("Sftp error: Garbage received from server"); break;
+    case(SshSftpNoConnectionError): errorMessage = QObject::tr("Sftp error: No connection has been set up"); break;
+    case(SshSftpConnectionLostError): errorMessage = QObject::tr("Sftp error: There was a connection, but we lost it"); break;
+    case(SshSftpOpUnsupportedError): errorMessage = QObject::tr("Sftp error: Operation not supported by libssh yet"); break;
+    case(SshSftpInvalidHandleError): errorMessage = QObject::tr("Sftp error: Invalid file handle"); break;
+    case(SshSftpNoSuchPathError): errorMessage = QObject::tr("Sftp error: No such file or directory path exists"); break;
+    case(SshSftpFileAlreadyExistsError): errorMessage = QObject::tr("Sftp error: An attempt to create an already existing file or directory has been made"); break;
+    case(SshSftpWriteProtectError): errorMessage = QObject::tr("Sftp error: Write-protected filesystem"); break;
+    case(SshSftpNoMediaError): errorMessage = QObject::tr("Sftp error: No media was in remote drive"); break;
 
     // Local errors
     case (OpenVpnConfigMissing): errorMessage = QObject::tr("OpenVPN config missing"); break;
@@ -56,14 +68,6 @@ QString errorString(ErrorCode code) {
     case (ApiConfigDownloadError): errorMessage = QObject::tr("Error when retrieving configuration from API"); break;
     case (ApiConfigAlreadyAdded): errorMessage = QObject::tr("This config has already been added to the application"); break;
 
-    // QFile errors
-    case(OpenError): errorMessage = QObject::tr("QFile error: The file could not be opened"); break;
-    case(ReadError): errorMessage = QObject::tr("QFile error: An error occurred when reading from the file"); break;
-    case(PermissionsError): errorMessage = QObject::tr("QFile error: The file could not be accessed"); break;
-    case(UnspecifiedError): errorMessage =  QObject::tr("QFile error: An unspecified error occurred"); break;
-    case(FatalError): errorMessage =  QObject::tr("QFile error: A fatal error occurred"); break;
-    case(AbortError): errorMessage =  QObject::tr("QFile error: The operation was aborted"); break;
-
     case(InternalError):
     default:
         errorMessage = QObject::tr("Internal error"); break;

client/core/ipcclient.cpp

@@ -71,7 +71,7 @@ QSharedPointer<PrivilegedProcess> IpcClient::CreatePrivilegedProcess()
     }
 
     QRemoteObjectPendingReply<int> futureResult = Instance()->m_ipcClient->createPrivilegedProcess();
-    futureResult.waitForFinished(5000);
+    futureResult.waitForFinished(1000);
 
     int pid = futureResult.returnValue();
 

client/core/sshclient.cpp

@@ -10,10 +10,16 @@ const uint32_t S_IRWXU = 0644;
 #endif
 
 namespace libssh {
-    constexpr auto libsshTimeoutError{"Timeout connecting to"};
+    const QString libsshTimeoutError = "Timeout connecting to";
 
     std::function<QString()> Client::m_passphraseCallback;
 
+    Client::Client(QObject *parent) : QObject(parent)
+    { }
+
+    Client::~Client()
+    { }
+
     int Client::callback(const char *prompt, char *buf, size_t len, int echo, int verify, void *userdata)
     {
         auto passphrase = m_passphraseCallback();
@@ -165,13 +171,13 @@ namespace libssh {
                     return ErrorCode::NoError;
                 };
 
-                auto errorCode = readOutput(false);
-                if (errorCode != ErrorCode::NoError) {
-                    return errorCode;
+                auto error = readOutput(false);
+                if (error != ErrorCode::NoError) {
+                    return error;
                 }
-                errorCode = readOutput(true);
-                if (errorCode != ErrorCode::NoError) {
-                    return errorCode;
+                error = readOutput(true);
+                if (error != ErrorCode::NoError) {
+                    return error;
                 }
             } else {
                 return closeChannel();
@@ -216,79 +222,100 @@ namespace libssh {
         return fromLibsshErrorCode();
     }
 
-    ErrorCode Client::scpFileCopy(const ScpOverwriteMode overwriteMode, const QString& localPath, const QString& remotePath, const QString &fileDesc)
+    ErrorCode Client::sftpFileCopy(const SftpOverwriteMode overwriteMode, const QString& localPath, const QString& remotePath, const QString &fileDesc)
     {
-        m_scpSession = ssh_scp_new(m_session, SSH_SCP_WRITE, remotePath.toStdString().c_str());
+        m_sftpSession = sftp_new(m_session);
 
-        if (m_scpSession == nullptr) {
-            return fromLibsshErrorCode();
+        if (m_sftpSession == nullptr) {
+            return closeSftpSession();
         }
 
-        if (ssh_scp_init(m_scpSession) != SSH_OK) {
-            auto errorCode = fromLibsshErrorCode();
-            closeScpSession();
-            return errorCode;
+        int result = sftp_init(m_sftpSession);
+
+        if (result != SSH_OK) {
+            return closeSftpSession();
         }
 
         QFutureWatcher<ErrorCode> watcher;
-        connect(&watcher, &QFutureWatcher<ErrorCode>::finished, this, &Client::scpFileCopyFinished);
-        QFuture<ErrorCode> future = QtConcurrent::run([this, overwriteMode, &localPath, &remotePath, &fileDesc]() {
-            const int accessType = O_WRONLY | O_CREAT | overwriteMode;
-            const int localFileSize = QFileInfo(localPath).size();
+        connect(&watcher, &QFutureWatcher<ErrorCode>::finished, this, &Client::sftpFileCopyFinished);
 
-            int result = ssh_scp_push_file(m_scpSession, remotePath.toStdString().c_str(), localFileSize, accessType);
-            if (result != SSH_OK) {
-                return fromLibsshErrorCode();
+        QFuture<ErrorCode> future = QtConcurrent::run([this, overwriteMode, &localPath, &remotePath, &fileDesc]() {
+            int accessType = O_WRONLY | O_CREAT | overwriteMode;
+            sftp_file file;
+            const size_t bufferSize = 16384;
+            char buffer[bufferSize];
+
+            file = sftp_open(m_sftpSession, remotePath.toStdString().c_str(), accessType, S_IRWXU);
+
+            if (file == nullptr) {
+                return closeSftpSession();
             }
 
+            int localFileSize = QFileInfo(localPath).size();
+            int chunksCount = localFileSize / (bufferSize);
+
             QFile fin(localPath);
 
             if (fin.open(QIODevice::ReadOnly)) {
-                constexpr size_t bufferSize = 16384;
-                int transferred = 0;
-                int currentChunkSize = bufferSize;
+                for (int currentChunkId = 0; currentChunkId < chunksCount; currentChunkId++) {
+                    QByteArray chunk = fin.read(bufferSize);
+                    if (chunk.size() != bufferSize) return ErrorCode::SshSftpEofError;
 
-                while (transferred < localFileSize) {
+                    int bytesWritten = sftp_write(file, chunk.data(), chunk.size());
 
-                    // Last Chunk
-                    if ((localFileSize - transferred) < bufferSize) {
-                        currentChunkSize = localFileSize % bufferSize;
+                    if (bytesWritten != chunk.size()) {
+                        fin.close();
+                        sftp_close(file);
+                        return closeSftpSession();
                     }
+                }
 
-                    QByteArray chunk = fin.read(currentChunkSize);
-                    if (chunk.size() != currentChunkSize) {
-                        return fromFileErrorCode(fin.error());
+                int lastChunkSize = localFileSize % bufferSize;
+
+                if (lastChunkSize != 0) {
+                    QByteArray lastChunk = fin.read(lastChunkSize);
+                    if (lastChunk.size() != lastChunkSize) return ErrorCode::SshSftpEofError;
+
+                    int bytesWritten = sftp_write(file, lastChunk.data(), lastChunkSize);
+
+                    if (bytesWritten != lastChunkSize) {
+                        fin.close();
+                        sftp_close(file);
+                        return closeSftpSession();
                     }
-
-                    result = ssh_scp_write(m_scpSession, chunk.data(), chunk.size());
-                    if (result != SSH_OK) {
-                        return fromLibsshErrorCode();
-                    }
-
-                    transferred += currentChunkSize;
                 }
             } else {
-                return fromFileErrorCode(fin.error());
+                sftp_close(file);
+                return closeSftpSession();
             }
 
-            return ErrorCode::NoError;
+            fin.close();
+
+            int result = sftp_close(file);
+            if (result != SSH_OK) {
+                return closeSftpSession();
+            }
+
+            return closeSftpSession();
         });
         watcher.setFuture(future);
 
         QEventLoop wait;
-        QObject::connect(this, &Client::scpFileCopyFinished, &wait, &QEventLoop::quit);
+        QObject::connect(this, &Client::sftpFileCopyFinished, &wait, &QEventLoop::quit);
         wait.exec();
 
-        closeScpSession();
         return watcher.result();
     }
 
-    void Client::closeScpSession()
+    ErrorCode Client::closeSftpSession()
     {
-        if (m_scpSession != nullptr) {
-            ssh_scp_free(m_scpSession);
-            m_scpSession = nullptr;
+        auto errorCode = fromLibsshSftpErrorCode(sftp_get_error(m_sftpSession));
+        if (m_sftpSession != nullptr) {
+            sftp_free(m_sftpSession);
+            m_sftpSession = nullptr;
         }
+        qCritical() << ssh_get_error(m_session);
+        return errorCode;
     }
 
     ErrorCode Client::fromLibsshErrorCode()
@@ -310,17 +337,24 @@ namespace libssh {
         default: return ErrorCode::SshInternalError;
         }
     }
-
-    ErrorCode Client::fromFileErrorCode(QFileDevice::FileError fileError)
+    ErrorCode Client::fromLibsshSftpErrorCode(int errorCode)
     {
-        switch (fileError) {
-        case QFileDevice::NoError: return ErrorCode::NoError;
-        case QFileDevice::ReadError: return ErrorCode::ReadError;
-        case QFileDevice::OpenError: return ErrorCode::OpenError;
-        case QFileDevice::PermissionsError: return ErrorCode::PermissionsError;
-        case QFileDevice::FatalError: return ErrorCode::FatalError;
-        case QFileDevice::AbortError: return ErrorCode::AbortError;
-        default: return ErrorCode::UnspecifiedError;
+        switch (errorCode) {
+        case(SSH_FX_OK): return ErrorCode::NoError;
+        case(SSH_FX_EOF): return ErrorCode::SshSftpEofError;
+        case(SSH_FX_NO_SUCH_FILE): return ErrorCode::SshSftpNoSuchFileError;
+        case(SSH_FX_PERMISSION_DENIED): return ErrorCode::SshSftpPermissionDeniedError;
+        case(SSH_FX_FAILURE): return ErrorCode::SshSftpFailureError;
+        case(SSH_FX_BAD_MESSAGE): return ErrorCode::SshSftpBadMessageError;
+        case(SSH_FX_NO_CONNECTION): return ErrorCode::SshSftpNoConnectionError;
+        case(SSH_FX_CONNECTION_LOST): return ErrorCode::SshSftpConnectionLostError;
+        case(SSH_FX_OP_UNSUPPORTED): return ErrorCode::SshSftpOpUnsupportedError;
+        case(SSH_FX_INVALID_HANDLE): return ErrorCode::SshSftpInvalidHandleError;
+        case(SSH_FX_NO_SUCH_PATH): return ErrorCode::SshSftpNoSuchPathError;
+        case(SSH_FX_FILE_ALREADY_EXISTS): return ErrorCode::SshSftpFileAlreadyExistsError;
+        case(SSH_FX_WRITE_PROTECT): return ErrorCode::SshSftpWriteProtectError;
+        case(SSH_FX_NO_MEDIA): return ErrorCode::SshSftpNoMediaError;
+        default: return ErrorCode::SshSftpFailureError;
         }
     }
 

client/core/sshclient.h

@@ -2,29 +2,29 @@
 #define SSHCLIENT_H
 
 #include <QObject>
-#include <QFile>
 
 #include <fcntl.h>
 
 #include <libssh/libssh.h>
+#include <libssh/sftp.h>
 
 #include "defs.h"
 
 using namespace amnezia;
 
 namespace libssh {
-    enum ScpOverwriteMode {
+    enum SftpOverwriteMode {
         /*! Overwrite any existing files */
-        ScpOverwriteExisting = O_TRUNC,
+        SftpOverwriteExisting = O_TRUNC,
         /*! Append new content if the file already exists */
-        ScpAppendToExisting = O_APPEND
+        SftpAppendToExisting = O_APPEND
     };
     class Client : public QObject
     {
         Q_OBJECT
     public:
-        Client() = default;
-        ~Client() = default;
+        Client(QObject *parent = nullptr);
+        ~Client();
 
         ErrorCode connectToHost(const ServerCredentials &credentials);
         void disconnectFromHost();
@@ -32,26 +32,26 @@ namespace libssh {
                                  const std::function<ErrorCode (const QString &, Client &)> &cbReadStdOut,
                                  const std::function<ErrorCode (const QString &, Client &)> &cbReadStdErr);
         ErrorCode writeResponse(const QString &data);
-        ErrorCode scpFileCopy(const ScpOverwriteMode overwriteMode,
+        ErrorCode sftpFileCopy(const SftpOverwriteMode overwriteMode,
                                const QString &localPath,
                                const QString &remotePath,
-                               const QString &fileDesc);
+                               const QString& fileDesc);
         ErrorCode getDecryptedPrivateKey(const ServerCredentials &credentials, QString &decryptedPrivateKey, const std::function<QString()> &passphraseCallback);
     private:
         ErrorCode closeChannel();
-        void closeScpSession();
+        ErrorCode closeSftpSession();
         ErrorCode fromLibsshErrorCode();
-        ErrorCode fromFileErrorCode(QFileDevice::FileError fileError);
+        ErrorCode fromLibsshSftpErrorCode(int errorCode);
         static int callback(const char *prompt, char *buf, size_t len, int echo, int verify, void *userdata);
 
         ssh_session m_session = nullptr;
         ssh_channel m_channel = nullptr;
-        ssh_scp m_scpSession = nullptr;
+        sftp_session m_sftpSession = nullptr;
 
         static std::function<QString()> m_passphraseCallback;
     signals:
         void writeToChannelFinished();
-        void scpFileCopyFinished();
+        void sftpFileCopyFinished();
     };
 }
 

client/daemon/daemon.cpp

@@ -251,19 +251,6 @@ bool Daemon::parseConfig(const QJsonObject& obj, InterfaceConfig& config) {
   GETVALUE("serverPskKey", config.m_serverPskKey, String);
   GETVALUE("serverPort", config.m_serverPort, Double);
 
-  if (!obj.contains("deviceMTU") || obj.value("deviceMTU").toString().toInt() == 0)
-  {
-    config.m_deviceMTU = 1420;
-  } else {
-    config.m_deviceMTU = obj.value("deviceMTU").toString().toInt();
-#ifdef Q_OS_WINDOWS
-// For Windows min MTU value is 1280 (the smallest MTU legal with IPv6).
-    if (config.m_deviceMTU < 1280) {
-      config.m_deviceMTU = 1280;
-    }
-#endif
-  }
-
   config.m_deviceIpv4Address = obj.value("deviceIpv4Address").toString();
   config.m_deviceIpv6Address = obj.value("deviceIpv6Address").toString();
   if (config.m_deviceIpv4Address.isNull() &&

client/daemon/interfaceconfig.cpp

@@ -23,7 +23,6 @@ QJsonObject InterfaceConfig::toJson() const {
   json.insert("serverIpv4AddrIn", QJsonValue(m_serverIpv4AddrIn));
   json.insert("serverIpv6AddrIn", QJsonValue(m_serverIpv6AddrIn));
   json.insert("serverPort", QJsonValue((double)m_serverPort));
-  json.insert("deviceMTU", QJsonValue(m_deviceMTU));
   if ((m_hopType == InterfaceConfig::MultiHopExit) ||
       (m_hopType == InterfaceConfig::SingleHop)) {
     json.insert("serverIpv4Gateway", QJsonValue(m_serverIpv4Gateway));
@@ -86,13 +85,8 @@ QString InterfaceConfig::toWgConf(const QMap<QString, QString>& extra) const {
   if (addresses.isEmpty()) {
     return "";
   }
-
   out << "Address = " << addresses.join(", ") << "\n";
 
-  if (m_deviceMTU) {
-    out << "MTU = " << m_deviceMTU << "\n";
-  }
-
   if (!m_dnsServer.isNull()) {
     QStringList dnsServers(m_dnsServer);
     // If the DNS is not the Gateway, it's a user defined DNS

client/daemon/interfaceconfig.h

@@ -33,7 +33,6 @@ class InterfaceConfig {
   QString m_serverIpv6AddrIn;
   QString m_dnsServer;
   int m_serverPort = 0;
-  int m_deviceMTU = 1420;
   QList<IPAddress> m_allowedIPAddressRanges;
   QStringList m_excludedAddresses;
   QStringList m_vpnDisabledApps;

client/images/controls/split-tunneling.svg

@@ -1,6 +0,0 @@
-<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.5" width="18" height="18" rx="5" fill="white"/>
-<path d="M8.49219 13.5L8.49219 9.44141L14.0191 4.99484" stroke="#0E0E11" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M4.47363 5.49805L6.98828 8.0127" stroke="#0E0E11" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.4727 9.5L14.4727 4.5033L9.50195 4.5033" stroke="#0E0E11" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

client/ios/networkextension/CMakeLists.txt

@@ -84,8 +84,7 @@ target_sources(networkextension PRIVATE
     ${CLIENT_ROOT_DIR}/platforms/ios/Log.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/LogRecord.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+WireGuard.swift
-    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+OpenVPN.swift
+    ${CLIENT_ROOT_DIR}/platforms/ios/PacketTunnelProvider+OpenVPNAdapterDelegate.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/WGConfig.swift
     ${CLIENT_ROOT_DIR}/platforms/ios/iosglue.mm
 )

client/main.cpp

@@ -26,10 +26,9 @@ int main(int argc, char *argv[])
     AllowSetForegroundWindow(ASFW_ANY);
 #endif
 
+// QTBUG-95974 QTBUG-95764 QTBUG-102168
 #ifdef Q_OS_ANDROID
-    // QTBUG-95974 QTBUG-95764 QTBUG-102168
     qputenv("QT_ANDROID_DISABLE_ACCESSIBILITY", "1");
-    qputenv("ANDROID_OPENSSL_SUFFIX", "_3");
 #endif
 
 #if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
@@ -49,6 +48,10 @@ int main(int argc, char *argv[])
     AllowSetForegroundWindow(0);
 #endif
 
+#if defined(Q_OS_IOS)
+    QtAppDelegateInitialize();
+#endif
+
     app.registerTypes();
 
     app.setApplicationName(APPLICATION_NAME);
@@ -62,7 +65,7 @@ int main(int argc, char *argv[])
     if (doExec) {
         app.init();
 
-        qInfo().noquote() << QString("Started %1 version %2 %3").arg(APPLICATION_NAME, APP_VERSION, GIT_COMMIT_HASH);
+        qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME, APP_VERSION);
         qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName(), QSysInfo::currentCpuArchitecture());
 
         return app.exec();

client/mozilla/localsocketcontroller.cpp

@@ -124,21 +124,13 @@ void LocalSocketController::activate(const QJsonObject &rawConfig) {
   //  json.insert("hopindex", QJsonValue((double)hop.m_hopindex));
   json.insert("privateKey", wgConfig.value(amnezia::config_key::client_priv_key));
   json.insert("deviceIpv4Address", wgConfig.value(amnezia::config_key::client_ip));
-
-  // set up IPv6 unique-local-address, ULA, with "fd00::/8" prefix, not globally routable.
-  // this will be default IPv6 gateway, OS recognizes that IPv6 link is local and switches to IPv4.
-  // Otherwise some OSes (Linux) try IPv6 forever and hang. 
-  // https://en.wikipedia.org/wiki/Unique_local_address (RFC 4193)
-  // https://man7.org/linux/man-pages/man5/gai.conf.5.html
-  json.insert("deviceIpv6Address", "fd58:baa6:dead::1"); // simply "dead::1" is globally-routable, don't use it
-
+  json.insert("deviceIpv6Address", "dead::1");
   json.insert("serverPublicKey", wgConfig.value(amnezia::config_key::server_pub_key));
   json.insert("serverPskKey", wgConfig.value(amnezia::config_key::psk_key));
   json.insert("serverIpv4AddrIn", wgConfig.value(amnezia::config_key::hostName));
   //  json.insert("serverIpv6AddrIn", QJsonValue(hop.m_server.ipv6AddrIn()));
-  json.insert("deviceMTU", wgConfig.value(amnezia::config_key::mtu));
-
   json.insert("serverPort", wgConfig.value(amnezia::config_key::port).toInt());
+
   json.insert("serverIpv4Gateway", wgConfig.value(amnezia::config_key::hostName));
   //  json.insert("serverIpv6Gateway", QJsonValue(hop.m_server.ipv6Gateway()));
   json.insert("dnsServer", rawConfig.value(amnezia::config_key::dns1));

client/platforms/android/android_controller.cpp

@@ -56,10 +56,26 @@ AndroidController::AndroidController() : QObject()
         Qt::QueuedConnection);
 
     connect(
-        this, &AndroidController::vpnStateChanged, this,
-        [this](AndroidController::ConnectionState state) {
-            qDebug() << "Android event: VPN state changed:" << textConnectionState(state);
-            emit connectionStateChanged(convertState(state));
+        this, &AndroidController::vpnConnected, this,
+        [this]() {
+            qDebug() << "Android event: VPN connected";
+            emit connectionStateChanged(Vpn::ConnectionState::Connected);
+        },
+        Qt::QueuedConnection);
+
+    connect(
+        this, &AndroidController::vpnDisconnected, this,
+        [this]() {
+            qDebug() << "Android event: VPN disconnected";
+            emit connectionStateChanged(Vpn::ConnectionState::Disconnected);
+        },
+        Qt::QueuedConnection);
+
+    connect(
+        this, &AndroidController::vpnReconnecting, this,
+        [this]() {
+            qDebug() << "Android event: VPN reconnecting";
+            emit connectionStateChanged(Vpn::ConnectionState::Reconnecting);
         },
         Qt::QueuedConnection);
 
@@ -90,7 +106,9 @@ bool AndroidController::initialize()
         {"onServiceDisconnected", "()V", reinterpret_cast<void *>(onServiceDisconnected)},
         {"onServiceError", "()V", reinterpret_cast<void *>(onServiceError)},
         {"onVpnPermissionRejected", "()V", reinterpret_cast<void *>(onVpnPermissionRejected)},
-        {"onVpnStateChanged", "(I)V", reinterpret_cast<void *>(onVpnStateChanged)},
+        {"onVpnConnected", "()V", reinterpret_cast<void *>(onVpnConnected)},
+        {"onVpnDisconnected", "()V", reinterpret_cast<void *>(onVpnDisconnected)},
+        {"onVpnReconnecting", "()V", reinterpret_cast<void *>(onVpnReconnecting)},
         {"onStatisticsUpdate", "(JJ)V", reinterpret_cast<void *>(onStatisticsUpdate)},
         {"onFileOpened", "(Ljava/lang/String;)V", reinterpret_cast<void *>(onFileOpened)},
         {"onConfigImported", "(Ljava/lang/String;)V", reinterpret_cast<void *>(onConfigImported)},
@@ -140,11 +158,6 @@ void AndroidController::stop()
     callActivityMethod("stop", "()V");
 }
 
-void AndroidController::resetLastServer(int serverIndex)
-{
-    callActivityMethod("resetLastServer", "(I)V", serverIndex);
-}
-
 void AndroidController::saveFile(const QString &fileName, const QString &data)
 {
     callActivityMethod("saveFile", "(Ljava/lang/String;Ljava/lang/String;)V",
@@ -204,11 +217,6 @@ void AndroidController::clearLogs()
     callActivityMethod("clearLogs", "()V");
 }
 
-void AndroidController::setScreenshotsEnabled(bool enabled)
-{
-    callActivityMethod("setScreenshotsEnabled", "(Z)V", enabled);
-}
-
 // Moving log processing to the Android side
 jclass AndroidController::log;
 jmethodID AndroidController::logDebug;
@@ -362,14 +370,30 @@ void AndroidController::onVpnPermissionRejected(JNIEnv *env, jobject thiz)
 }
 
 // static
-void AndroidController::onVpnStateChanged(JNIEnv *env, jobject thiz, jint stateCode)
+void AndroidController::onVpnConnected(JNIEnv *env, jobject thiz)
 {
     Q_UNUSED(env);
     Q_UNUSED(thiz);
 
-    auto state = ConnectionState(stateCode);
+    emit AndroidController::instance()->vpnConnected();
+}
 
-    emit AndroidController::instance()->vpnStateChanged(state);
+// static
+void AndroidController::onVpnDisconnected(JNIEnv *env, jobject thiz)
+{
+    Q_UNUSED(env);
+    Q_UNUSED(thiz);
+
+    emit AndroidController::instance()->vpnDisconnected();
+}
+
+// static
+void AndroidController::onVpnReconnecting(JNIEnv *env, jobject thiz)
+{
+    Q_UNUSED(env);
+    Q_UNUSED(thiz);
+
+    emit AndroidController::instance()->vpnReconnecting();
 }
 
 // static

client/platforms/android/android_controller.h

@@ -20,9 +20,9 @@ public:
     // keep synchronized with org.amnezia.vpn.protocol.ProtocolState
     enum class ConnectionState
     {
-        DISCONNECTED,
         CONNECTED,
         CONNECTING,
+        DISCONNECTED,
         DISCONNECTING,
         RECONNECTING,
         UNKNOWN
@@ -30,7 +30,6 @@ public:
 
     ErrorCode start(const QJsonObject &vpnConfig);
     void stop();
-    void resetLastServer(int serverIndex);
     void setNotificationText(const QString &title, const QString &message, int timerSec);
     void saveFile(const QString &fileName, const QString &data);
     QString openFile(const QString &filter);
@@ -39,7 +38,6 @@ public:
     void setSaveLogs(bool enabled);
     void exportLogsFile(const QString &fileName);
     void clearLogs();
-    void setScreenshotsEnabled(bool enabled);
 
     static bool initLogging();
     static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);
@@ -50,7 +48,9 @@ signals:
     void serviceDisconnected();
     void serviceError();
     void vpnPermissionRejected();
-    void vpnStateChanged(ConnectionState state);
+    void vpnConnected();
+    void vpnDisconnected();
+    void vpnReconnecting();
     void statisticsUpdated(quint64 rxBytes, quint64 txBytes);
     void fileOpened(QString uri);
     void configImported(QString config);
@@ -77,7 +77,9 @@ private:
     static void onServiceDisconnected(JNIEnv *env, jobject thiz);
     static void onServiceError(JNIEnv *env, jobject thiz);
     static void onVpnPermissionRejected(JNIEnv *env, jobject thiz);
-    static void onVpnStateChanged(JNIEnv *env, jobject thiz, jint stateCode);
+    static void onVpnConnected(JNIEnv *env, jobject thiz);
+    static void onVpnDisconnected(JNIEnv *env, jobject thiz);
+    static void onVpnReconnecting(JNIEnv *env, jobject thiz);
     static void onStatisticsUpdate(JNIEnv *env, jobject thiz, jlong rxBytes, jlong txBytes);
     static void onConfigImported(JNIEnv *env, jobject thiz, jstring data);
     static void onFileOpened(JNIEnv *env, jobject thiz, jstring uri);

client/platforms/ios/Log.swift

@@ -2,8 +2,6 @@ import Foundation
 import os.log
 
 struct Log {
-  static let osLog = Logger()
-
   private static let IsLoggingEnabledKey = "IsLoggingEnabled"
   static var isLoggingEnabled: Bool {
     get {
@@ -31,23 +29,16 @@ struct Log {
     return dateFormatter
   }()
 
-  var records = [Record]()
-
-  var lastRecordDate = Date.distantPast
+  var records: [Record]
 
   init() {
     self.records = []
   }
 
   init(_ str: String) {
-    records = str.split(whereSeparator: \.isNewline)
-      .map {
-        if let record = Record(String($0)) {
-          lastRecordDate = record.date
-          return record
-        } else {
-          return Record(date: lastRecordDate, level: .error, message: "LOG: \($0)")
-        }
+    self.records = str.split(whereSeparator: \.isNewline)
+      .compactMap {
+        Record(String($0))!
       }
   }
 
@@ -69,24 +60,6 @@ struct Log {
     self.init(str)
   }
 
-  static func log(_ type: OSLogType, title: String = "", message: String, url: URL = neLogURL) {
-    guard isLoggingEnabled else { return }
-
-    let date = Date()
-    let level = Record.Level(from: type)
-    let messages = message.split(whereSeparator: \.isNewline)
-
-    for index in 0..<messages.count {
-      let message = String(messages[index])
-
-      if index != 0 && message.first != " " {
-        Record(date: date, level: level, message: "\(title)  \(message)").save(at: url)
-      } else {
-        Record(date: date, level: level, message: "\(title)\(message)").save(at: url)
-      }
-    }
-  }
-
   static func clear(at url: URL) {
     if FileManager.default.fileExists(atPath: url.path) {
       guard let fileHandle = try? FileHandle(forUpdating: url) else { return }

client/platforms/ios/LogController.swift

@@ -1,5 +1,4 @@
 import Foundation
-import NetworkExtension
 
 public func swiftUpdateLogData(_ qtString: std.string) -> std.string {
   let qtLog = Log(String(describing: qtString))
@@ -25,26 +24,3 @@ public func swiftDeleteLog() {
 public func toggleLogging(_ isEnabled: Bool) {
   Log.isLoggingEnabled = isEnabled
 }
-
-public func clearSettings() {
-  NETunnelProviderManager.loadAllFromPreferences { managers, error in
-    if let error {
-      NSLog("clearSettings removeFromPreferences error: \(error.localizedDescription)")
-      return
-    }
-
-    managers?.forEach { manager in
-      manager.removeFromPreferences { error in
-        if let error {
-          NSLog("NE removeFromPreferences error: \(error.localizedDescription)")
-        } else {
-          manager.loadFromPreferences { error in
-            if let error {
-              NSLog("NE loadFromPreferences after remove error: \(error.localizedDescription)")
-            }
-          }
-        }
-      }
-    }
-  }
-}

client/platforms/ios/LogRecord.swift

@@ -30,8 +30,6 @@ extension Log {
     }
 
     func save(at url: URL) {
-      osLog.log(level: level.osLogType, "\(message)")
-
       guard let data = "\n\(description)".data(using: .utf8) else { return }
 
       if !FileManager.default.fileExists(atPath: url.path) {
@@ -66,38 +64,19 @@ extension Log.Record {
 
     init(from osLogType: OSLogType) {
       switch osLogType {
-      case .default:
+      case OSLogType.default:
         self = .info
-      case .info:
+      case OSLogType.info:
         self = .info
-      case .debug:
+      case OSLogType.debug:
         self = .debug
-      case .error:
+      case OSLogType.error:
         self = .error
-      case .fault:
+      case OSLogType.fault:
         self = .fatal
       default:
         self = .info
       }
     }
-
-    var osLogType: OSLogType {
-      switch self {
-      case .info:
-        return .info
-      case .debug:
-        return .debug
-      case .error:
-        return .error
-      case .fatal:
-        return .fault
-      case .warning:
-        return .info
-      case .critical:
-        return .fault
-      case .system:
-        return .fault
-      }
-    }
   }
 }

client/platforms/ios/NELogController.swift

@@ -1,18 +1,18 @@
 import Foundation
 import os.log
 
-public func wg_log(_ type: OSLogType, title: String = "", staticMessage: StaticString) {
-  neLog(type, title: "WG: \(title)", message: "\(staticMessage)")
+public func wg_log(_ type: OSLogType, staticMessage: StaticString) {
+  guard Log.isLoggingEnabled else { return }
+
+  Log.Record(date: Date(), level: Log.Record.Level(from: type), message: "\(staticMessage)").save(at: Log.neLogURL)
 }
 
-public func wg_log(_ type: OSLogType, title: String = "", message: String) {
-  neLog(type, title: "WG: \(title)", message: message)
+public func wg_log(_ type: OSLogType, message: String) {
+  log(type, message: message)
 }
 
-public func ovpnLog(_ type: OSLogType, title: String = "", message: String) {
-  neLog(type, title: "OVPN: \(title)", message: message)
-}
+public func log(_ type: OSLogType, message: String) {
+  guard Log.isLoggingEnabled else { return }
 
-public func neLog(_ type: OSLogType, title: String = "", message: String) {
-    Log.log(type, title: "NE: \(title)", message: message)
+  Log.Record(date: Date(), level: Log.Record.Level(from: type), message: message).save(at: Log.neLogURL)
 }

client/platforms/ios/PacketTunnelProvider+OpenVPN.swift

@@ -1,223 +0,0 @@
-import Foundation
-import NetworkExtension
-import OpenVPNAdapter
-
-struct OpenVPNConfig: Decodable {
-  let config: String
-  let splitTunnelType: Int
-  let splitTunnelSites: [String]
-
-  var str: String {
-    "splitTunnelType: \(splitTunnelType) splitTunnelSites: \(splitTunnelSites) config: \(config)"
-  }
-}
-
-extension PacketTunnelProvider {
-  func startOpenVPN(completionHandler: @escaping (Error?) -> Void) {
-    guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
-          let providerConfiguration = protocolConfiguration.providerConfiguration,
-          let openVPNConfigData = providerConfiguration[Constants.ovpnConfigKey] as? Data else {
-      ovpnLog(.error, message: "Can't start")
-      return
-    }
-
-    do {
-      //      ovpnLog(.info, message: "providerConfiguration: \(String(decoding: openVPNConfigData, as: UTF8.self))")
-
-      let openVPNConfig = try JSONDecoder().decode(OpenVPNConfig.self, from: openVPNConfigData)
-      ovpnLog(.info, title: "config: ", message: openVPNConfig.str)
-      let ovpnConfiguration = Data(openVPNConfig.config.utf8)
-      setupAndlaunchOpenVPN(withConfig: ovpnConfiguration, completionHandler: completionHandler)
-    } catch {
-      ovpnLog(.error, message: "Can't parse config: \(error.localizedDescription)")
-
-      if let underlyingError = (error as NSError).userInfo[NSUnderlyingErrorKey] as? NSError {
-        ovpnLog(.error, message: "Can't parse config: \(underlyingError.localizedDescription)")
-      }
-
-      return
-    }
-  }
-
-  private func setupAndlaunchOpenVPN(withConfig ovpnConfiguration: Data,
-                                     withShadowSocks viaSS: Bool = false,
-                                     completionHandler: @escaping (Error?) -> Void) {
-    ovpnLog(.info, message: "Setup and launch")
-
-    let str = String(decoding: ovpnConfiguration, as: UTF8.self)
-
-    let configuration = OpenVPNConfiguration()
-    configuration.fileContent = ovpnConfiguration
-    if str.contains("cloak") {
-      configuration.setPTCloak()
-    }
-
-    let evaluation: OpenVPNConfigurationEvaluation
-    do {
-      evaluation = try ovpnAdapter.apply(configuration: configuration)
-
-    } catch {
-      completionHandler(error)
-      return
-    }
-
-    if !evaluation.autologin {
-      ovpnLog(.info, message: "Implement login with user credentials")
-    }
-
-    vpnReachability.startTracking { [weak self] status in
-      guard status == .reachableViaWiFi else { return }
-      self?.ovpnAdapter.reconnect(afterTimeInterval: 5)
-    }
-
-    startHandler = completionHandler
-    ovpnAdapter.connect(using: packetFlow)
-
-    //        let ifaces = Interface.allInterfaces()
-    //            .filter { $0.family == .ipv4 }
-    //            .map { iface in iface.name }
-
-    //        ovpn_log(.error, message: "Available TUN Interfaces: \(ifaces)")
-  }
-
-  func handleOpenVPNStatusMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
-    guard let completionHandler = completionHandler else { return }
-    let bytesin = ovpnAdapter.transportStatistics.bytesIn
-    let bytesout = ovpnAdapter.transportStatistics.bytesOut
-
-    let response: [String: Any] = [
-      "rx_bytes": bytesin,
-      "tx_bytes": bytesout
-    ]
-
-    completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
-  }
-
-  func stopOpenVPN(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
-    stopHandler = completionHandler
-    if vpnReachability.isTracking {
-      vpnReachability.stopTracking()
-    }
-    ovpnAdapter.disconnect()
-  }
-}
-
-extension PacketTunnelProvider: OpenVPNAdapterDelegate {
-  // OpenVPNAdapter calls this delegate method to configure a VPN tunnel.
-  // `completionHandler` callback requires an object conforming to `OpenVPNAdapterPacketFlow`
-  // protocol if the tunnel is configured without errors. Otherwise send nil.
-  // `OpenVPNAdapterPacketFlow` method signatures are similar to `NEPacketTunnelFlow` so
-  // you can just extend that class to adopt `OpenVPNAdapterPacketFlow` protocol and
-  // send `self.packetFlow` to `completionHandler` callback.
-  func openVPNAdapter(
-    _ openVPNAdapter: OpenVPNAdapter,
-    configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings?,
-    completionHandler: @escaping (Error?) -> Void
-  ) {
-    // In order to direct all DNS queries first to the VPN DNS servers before the primary DNS servers
-    // send empty string to NEDNSSettings.matchDomains
-    networkSettings?.dnsSettings?.matchDomains = [""]
-
-    if splitTunnelType == 1 {
-      var ipv4IncludedRoutes = [NEIPv4Route]()
-
-      for allowedIPString in splitTunnelSites {
-        if let allowedIP = IPAddressRange(from: allowedIPString) {
-          ipv4IncludedRoutes.append(NEIPv4Route(
-            destinationAddress: "\(allowedIP.address)",
-            subnetMask: "\(allowedIP.subnetMask())"))
-        }
-      }
-
-      networkSettings?.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
-    } else {
-      if splitTunnelType == 2 {
-        var ipv4ExcludedRoutes = [NEIPv4Route]()
-        var ipv4IncludedRoutes = [NEIPv4Route]()
-        var ipv6IncludedRoutes = [NEIPv6Route]()
-
-        for excludeIPString in splitTunnelSites {
-          if let excludeIP = IPAddressRange(from: excludeIPString) {
-            ipv4ExcludedRoutes.append(NEIPv4Route(
-              destinationAddress: "\(excludeIP.address)",
-              subnetMask: "\(excludeIP.subnetMask())"))
-          }
-        }
-
-        if let allIPv4 = IPAddressRange(from: "0.0.0.0/0") {
-          ipv4IncludedRoutes.append(NEIPv4Route(
-            destinationAddress: "\(allIPv4.address)",
-            subnetMask: "\(allIPv4.subnetMask())"))
-        }
-        if let allIPv6 = IPAddressRange(from: "::/0") {
-          ipv6IncludedRoutes.append(NEIPv6Route(
-            destinationAddress: "\(allIPv6.address)",
-            networkPrefixLength: NSNumber(value: allIPv6.networkPrefixLength)))
-        }
-        networkSettings?.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
-        networkSettings?.ipv6Settings?.includedRoutes = ipv6IncludedRoutes
-        networkSettings?.ipv4Settings?.excludedRoutes = ipv4ExcludedRoutes
-      }
-    }
-
-    // Set the network settings for the current tunneling session.
-    setTunnelNetworkSettings(networkSettings, completionHandler: completionHandler)
-  }
-
-  // Process events returned by the OpenVPN library
-  func openVPNAdapter(
-    _ openVPNAdapter: OpenVPNAdapter,
-    handleEvent event: OpenVPNAdapterEvent,
-    message: String?) {
-      switch event {
-      case .connected:
-        if reasserting {
-          reasserting = false
-        }
-
-        guard let startHandler = startHandler else { return }
-
-        startHandler(nil)
-        self.startHandler = nil
-      case .disconnected:
-        guard let stopHandler = stopHandler else { return }
-
-        if vpnReachability.isTracking {
-          vpnReachability.stopTracking()
-        }
-
-        stopHandler()
-        self.stopHandler = nil
-      case .reconnecting:
-        reasserting = true
-      default:
-        break
-      }
-    }
-
-  // Handle errors thrown by the OpenVPN library
-  func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleError error: Error) {
-    // Handle only fatal errors
-    guard let fatal = (error as NSError).userInfo[OpenVPNAdapterErrorFatalKey] as? Bool,
-          fatal == true else { return }
-
-    if vpnReachability.isTracking {
-      vpnReachability.stopTracking()
-    }
-
-    if let startHandler {
-      startHandler(error)
-      self.startHandler = nil
-    } else {
-      cancelTunnelWithError(error)
-    }
-  }
-
-  // Use this method to process any log message returned by OpenVPN library.
-  func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleLogMessage logMessage: String) {
-    // Handle log messages
-    ovpnLog(.info, message: logMessage)
-  }
-}
-
-extension NEPacketTunnelFlow: OpenVPNAdapterPacketFlow {}

client/platforms/ios/PacketTunnelProvider+OpenVPNAdapterDelegate.swift

@@ -0,0 +1,129 @@
+import Foundation
+import NetworkExtension
+import OpenVPNAdapter
+
+extension PacketTunnelProvider: OpenVPNAdapterDelegate {
+  // OpenVPNAdapter calls this delegate method to configure a VPN tunnel.
+  // `completionHandler` callback requires an object conforming to `OpenVPNAdapterPacketFlow`
+  // protocol if the tunnel is configured without errors. Otherwise send nil.
+  // `OpenVPNAdapterPacketFlow` method signatures are similar to `NEPacketTunnelFlow` so
+  // you can just extend that class to adopt `OpenVPNAdapterPacketFlow` protocol and
+  // send `self.packetFlow` to `completionHandler` callback.
+  func openVPNAdapter(
+    _ openVPNAdapter: OpenVPNAdapter,
+    configureTunnelWithNetworkSettings networkSettings: NEPacketTunnelNetworkSettings?,
+    completionHandler: @escaping (Error?) -> Void
+  ) {
+    // In order to direct all DNS queries first to the VPN DNS servers before the primary DNS servers
+    // send empty string to NEDNSSettings.matchDomains
+    networkSettings?.dnsSettings?.matchDomains = [""]
+
+    if splitTunnelType == "1" {
+      var ipv4IncludedRoutes = [NEIPv4Route]()
+      let STSdata = Data(splitTunnelSites!.utf8)
+      do {
+        guard let STSArray = try JSONSerialization.jsonObject(with: STSdata) as? [String] else { return }
+        for allowedIPString in STSArray {
+          if let allowedIP = IPAddressRange(from: allowedIPString) {
+            ipv4IncludedRoutes.append(NEIPv4Route(
+              destinationAddress: "\(allowedIP.address)",
+              subnetMask: "\(allowedIP.subnetMask())"))
+          }
+        }
+      } catch {
+        wg_log(.error, message: "Parse JSONSerialization Error")
+      }
+      networkSettings?.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
+    } else {
+      if splitTunnelType == "2" {
+        var ipv4ExcludedRoutes = [NEIPv4Route]()
+        var ipv4IncludedRoutes = [NEIPv4Route]()
+        var ipv6IncludedRoutes = [NEIPv6Route]()
+        let STSdata = Data(splitTunnelSites!.utf8)
+        do {
+          guard let STSArray = try JSONSerialization.jsonObject(with: STSdata) as? [String] else { return }
+          for excludeIPString in STSArray {
+            if let excludeIP = IPAddressRange(from: excludeIPString) {
+              ipv4ExcludedRoutes.append(NEIPv4Route(
+                destinationAddress: "\(excludeIP.address)",
+                subnetMask: "\(excludeIP.subnetMask())"))
+            }
+          }
+        } catch {
+          wg_log(.error, message: "Parse JSONSerialization Error")
+        }
+        if let allIPv4 = IPAddressRange(from: "0.0.0.0/0") {
+          ipv4IncludedRoutes.append(NEIPv4Route(
+            destinationAddress: "\(allIPv4.address)",
+            subnetMask: "\(allIPv4.subnetMask())"))
+        }
+        if let allIPv6 = IPAddressRange(from: "::/0") {
+          ipv6IncludedRoutes.append(NEIPv6Route(
+            destinationAddress: "\(allIPv6.address)",
+            networkPrefixLength: NSNumber(value: allIPv6.networkPrefixLength)))
+        }
+        networkSettings?.ipv4Settings?.includedRoutes = ipv4IncludedRoutes
+        networkSettings?.ipv6Settings?.includedRoutes = ipv6IncludedRoutes
+        networkSettings?.ipv4Settings?.excludedRoutes = ipv4ExcludedRoutes
+      }
+    }
+
+    // Set the network settings for the current tunneling session.
+    setTunnelNetworkSettings(networkSettings, completionHandler: completionHandler)
+  }
+
+  // Process events returned by the OpenVPN library
+  func openVPNAdapter(
+    _ openVPNAdapter: OpenVPNAdapter,
+    handleEvent event: OpenVPNAdapterEvent,
+    message: String?) {
+      switch event {
+      case .connected:
+        if reasserting {
+          reasserting = false
+        }
+
+        guard let startHandler = startHandler else { return }
+
+        startHandler(nil)
+        self.startHandler = nil
+      case .disconnected:
+        guard let stopHandler = stopHandler else { return }
+
+        if vpnReachability.isTracking {
+          vpnReachability.stopTracking()
+        }
+
+        stopHandler()
+        self.stopHandler = nil
+      case .reconnecting:
+        reasserting = true
+      default:
+        break
+      }
+    }
+
+  // Handle errors thrown by the OpenVPN library
+  func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleError error: Error) {
+    // Handle only fatal errors
+    guard let fatal = (error as NSError).userInfo[OpenVPNAdapterErrorFatalKey] as? Bool,
+          fatal == true else { return }
+
+    if vpnReachability.isTracking {
+      vpnReachability.stopTracking()
+    }
+
+    if let startHandler {
+      startHandler(error)
+      self.startHandler = nil
+    } else {
+      cancelTunnelWithError(error)
+    }
+  }
+
+  // Use this method to process any log message returned by OpenVPN library.
+  func openVPNAdapter(_ openVPNAdapter: OpenVPNAdapter, handleLogMessage logMessage: String) {
+    // Handle log messages
+    wg_log(.info, message: logMessage)
+  }
+}

client/platforms/ios/PacketTunnelProvider+WireGuard.swift

@@ -1,221 +0,0 @@
-import Foundation
-import NetworkExtension
-
-extension PacketTunnelProvider {
-  func startWireguard(activationAttemptId: String?,
-                      errorNotifier: ErrorNotifier,
-                      completionHandler: @escaping (Error?) -> Void) {
-    guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
-          let providerConfiguration = protocolConfiguration.providerConfiguration,
-          let wgConfigData: Data = providerConfiguration[Constants.wireGuardConfigKey] as? Data else {
-      wg_log(.error, message: "Can't start, config missing")
-      completionHandler(nil)
-      return
-    }
-
-    do {
-      let wgConfig = try JSONDecoder().decode(WGConfig.self, from: wgConfigData)
-      let wgConfigStr = wgConfig.str
-      wg_log(.info, title: "config: ", message: wgConfig.redux)
-
-      let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: wgConfigStr)
-
-      if tunnelConfiguration.peers.first!.allowedIPs
-        .map({ $0.stringRepresentation })
-        .joined(separator: ", ") == "0.0.0.0/0, ::/0" {
-        if wgConfig.splitTunnelType == 1 {
-          for index in tunnelConfiguration.peers.indices {
-            tunnelConfiguration.peers[index].allowedIPs.removeAll()
-            var allowedIPs = [IPAddressRange]()
-
-            for allowedIPString in wgConfig.splitTunnelSites {
-              if let allowedIP = IPAddressRange(from: allowedIPString) {
-                allowedIPs.append(allowedIP)
-              }
-            }
-
-            tunnelConfiguration.peers[index].allowedIPs = allowedIPs
-          }
-        } else if wgConfig.splitTunnelType == 2 {
-          for index in tunnelConfiguration.peers.indices {
-            var excludeIPs = [IPAddressRange]()
-
-            for excludeIPString in wgConfig.splitTunnelSites {
-              if let excludeIP = IPAddressRange(from: excludeIPString) {
-                excludeIPs.append(excludeIP)
-              }
-            }
-
-            tunnelConfiguration.peers[index].excludeIPs = excludeIPs
-          }
-        }
-      }
-
-      wg_log(.info, message: "Starting tunnel from the " +
-             (activationAttemptId == nil ? "OS directly, rather than the app" : "app"))
-
-      // Start the tunnel
-      wgAdapter.start(tunnelConfiguration: tunnelConfiguration) { adapterError in
-        guard let adapterError else {
-          let interfaceName = self.wgAdapter.interfaceName ?? "unknown"
-          wg_log(.info, message: "Tunnel interface is \(interfaceName)")
-          completionHandler(nil)
-          return
-        }
-
-        switch adapterError {
-        case .cannotLocateTunnelFileDescriptor:
-          wg_log(.error, staticMessage: "Starting tunnel failed: could not determine file descriptor")
-          errorNotifier.notify(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
-          completionHandler(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
-        case .dnsResolution(let dnsErrors):
-          let hostnamesWithDnsResolutionFailure = dnsErrors.map { $0.address }
-            .joined(separator: ", ")
-          wg_log(.error, message:
-                  "DNS resolution failed for the following hostnames: \(hostnamesWithDnsResolutionFailure)")
-          errorNotifier.notify(PacketTunnelProviderError.dnsResolutionFailure)
-          completionHandler(PacketTunnelProviderError.dnsResolutionFailure)
-        case .setNetworkSettings(let error):
-          wg_log(.error, message:
-                  "Starting tunnel failed with setTunnelNetworkSettings returning \(error.localizedDescription)")
-          errorNotifier.notify(PacketTunnelProviderError.couldNotSetNetworkSettings)
-          completionHandler(PacketTunnelProviderError.couldNotSetNetworkSettings)
-        case .startWireGuardBackend(let errorCode):
-          wg_log(.error, message: "Starting tunnel failed with wgTurnOn returning \(errorCode)")
-          errorNotifier.notify(PacketTunnelProviderError.couldNotStartBackend)
-          completionHandler(PacketTunnelProviderError.couldNotStartBackend)
-        case .invalidState:
-          fatalError()
-        }
-      }
-    } catch {
-      wg_log(.error, message: "Can't parse WG config: \(error.localizedDescription)")
-      completionHandler(nil)
-      return
-    }
-  }
-
-  func handleWireguardStatusMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
-    guard let completionHandler = completionHandler else { return }
-    wgAdapter.getRuntimeConfiguration { settings in
-      var data: Data?
-      if let settings {
-        data = settings.data(using: .utf8)!
-      }
-
-      let components = settings!.components(separatedBy: "\n")
-
-      var settingsDictionary: [String: String] = [:]
-      for component in components {
-        let pair = component.components(separatedBy: "=")
-        if pair.count == 2 {
-          settingsDictionary[pair[0]] = pair[1]
-        }
-      }
-
-      let response: [String: Any] = [
-        "rx_bytes": settingsDictionary["rx_bytes"] ?? "0",
-        "tx_bytes": settingsDictionary["tx_bytes"] ?? "0"
-      ]
-
-      completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
-    }
-  }
-
-  private func handleWireguardAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
-    guard let completionHandler = completionHandler else { return }
-    if messageData.count == 1 && messageData[0] == 0 {
-      wgAdapter.getRuntimeConfiguration { settings in
-        var data: Data?
-        if let settings {
-          data = settings.data(using: .utf8)!
-        }
-        completionHandler(data)
-      }
-    } else if messageData.count >= 1 {
-      // Updates the tunnel configuration and responds with the active configuration
-      wg_log(.info, message: "Switching tunnel configuration")
-      guard let configString = String(data: messageData, encoding: .utf8)
-      else {
-        completionHandler(nil)
-        return
-      }
-
-      do {
-        let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: configString)
-        wgAdapter.update(tunnelConfiguration: tunnelConfiguration) { error in
-          if let error {
-            wg_log(.error, message: "Failed to switch tunnel configuration: \(error.localizedDescription)")
-            completionHandler(nil)
-            return
-          }
-
-          self.wgAdapter.getRuntimeConfiguration { settings in
-            var data: Data?
-            if let settings {
-              data = settings.data(using: .utf8)!
-            }
-            completionHandler(data)
-          }
-        }
-      } catch {
-        completionHandler(nil)
-      }
-    } else {
-      completionHandler(nil)
-    }
-  }
-
-  //  private func startEmptyTunnel(completionHandler: @escaping (Error?) -> Void) {
-  //    dispatchPrecondition(condition: .onQueue(dispatchQueue))
-  //
-  //    let emptyTunnelConfiguration = TunnelConfiguration(
-  //      name: nil,
-  //      interface: InterfaceConfiguration(privateKey: PrivateKey()),
-  //      peers: []
-  //    )
-  //
-  //    wgAdapter.start(tunnelConfiguration: emptyTunnelConfiguration) { error in
-  //      self.dispatchQueue.async {
-  //        if let error {
-  //          wg_log(.error, message: "Failed to start an empty tunnel")
-  //          completionHandler(error)
-  //        } else {
-  //          wg_log(.info, message: "Started an empty tunnel")
-  //          self.tunnelAdapterDidStart()
-  //        }
-  //      }
-  //    }
-  //
-  //    let settings = NETunnelNetworkSettings(tunnelRemoteAddress: "1.1.1.1")
-  //
-  //    self.setTunnelNetworkSettings(settings) { error in
-  //      completionHandler(error)
-  //    }
-  //  }
-
-  //  private func tunnelAdapterDidStart() {
-  //    dispatchPrecondition(condition: .onQueue(dispatchQueue))
-  //    // ...
-  //  }
-
-  func stopWireguard(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
-    wg_log(.info, staticMessage: "Stopping tunnel")
-
-    wgAdapter.stop { error in
-      ErrorNotifier.removeLastErrorFile()
-
-      if let error {
-        wg_log(.error, message: "Failed to stop WireGuard adapter: \(error.localizedDescription)")
-      }
-      completionHandler()
-
-#if os(macOS)
-      // HACK: This is a filthy hack to work around Apple bug 32073323 (dup'd by us as 47526107).
-      // Remove it when they finally fix this upstream and the fix has been rolled out to
-      // sufficient quantities of users.
-      exit(0)
-#endif
-    }
-  }
-}

client/platforms/ios/PacketTunnelProvider.swift

@@ -15,7 +15,7 @@ struct Constants {
   static let ovpnConfigKey = "ovpn"
   static let wireGuardConfigKey = "wireguard"
   static let loggerTag = "NET"
-  
+
   static let kActionStart = "start"
   static let kActionRestart = "restart"
   static let kActionStop = "stop"
@@ -34,68 +34,78 @@ struct Constants {
 }
 
 class PacketTunnelProvider: NEPacketTunnelProvider {
-  lazy var wgAdapter = {
+  private lazy var wgAdapter = {
     WireGuardAdapter(with: self) { logLevel, message in
       wg_log(logLevel.osLogLevel, message: message)
     }
   }()
-  
-  lazy var ovpnAdapter: OpenVPNAdapter = {
+
+  private lazy var ovpnAdapter: OpenVPNAdapter = {
     let adapter = OpenVPNAdapter()
     adapter.delegate = self
     return adapter
   }()
-  
+
   /// Internal queue.
   private let dispatchQueue = DispatchQueue(label: "PacketTunnel", qos: .utility)
-  
-  var splitTunnelType: Int!
-  var splitTunnelSites: [String]!
-  
+
+  private var openVPNConfig: Data?
+  var splitTunnelType: String?
+  var splitTunnelSites: String?
+
   let vpnReachability = OpenVPNReachability()
-  
+
   var startHandler: ((Error?) -> Void)?
   var stopHandler: (() -> Void)?
   var protoType: TunnelProtoType = .none
-  
+
   override func handleAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
-    guard let message = String(data: messageData, encoding: .utf8) else {
-      if let completionHandler {
-        completionHandler(nil)
-      }
-      return
-    }
-    
-    neLog(.info, title: "App said: ", message: message)
-    
+    let tmpStr = String(data: messageData, encoding: .utf8)!
+    wg_log(.error, message: tmpStr)
     guard let message = try? JSONSerialization.jsonObject(with: messageData, options: []) as? [String: Any] else {
-      neLog(.error, message: "Failed to serialize message from app")
+      log(.error, message: "Failed to serialize message from app")
       return
     }
-    
+
     guard let completionHandler else {
-      neLog(.error, message: "Missing message completion handler")
+      log(.error, message: "Missing message completion handler")
       return
     }
-    
+
     guard let action = message[Constants.kMessageKeyAction] as? String else {
-      neLog(.error, message: "Missing action key in app message")
+      log(.error, message: "Missing action key in app message")
       completionHandler(nil)
       return
     }
-    
+
     if action == Constants.kActionStatus {
       handleStatusAppMessage(messageData, completionHandler: completionHandler)
     }
+
+    if action == Constants.kActionStart {
+      splitTunnelType = message[Constants.kMessageKeySplitTunnelType] as? String
+      splitTunnelSites = message[Constants.kMessageKeySplitTunnelSites] as? String
+    }
+
+    let callbackWrapper: (NSNumber?) -> Void = { errorCode in
+      // let tunnelId = self.tunnelConfig?.id ?? ""
+      let response: [String: Any] = [
+        Constants.kMessageKeyAction: action,
+        Constants.kMessageKeyErrorCode: errorCode ?? NSNull(),
+        Constants.kMessageKeyTunnelId: 0
+      ]
+
+      completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
+    }
   }
-  
+
   override func startTunnel(options: [String: NSObject]?, completionHandler: @escaping (Error?) -> Void) {
     dispatchQueue.async {
       let activationAttemptId = options?[Constants.kActivationAttemptId] as? String
       let errorNotifier = ErrorNotifier(activationAttemptId: activationAttemptId)
-      
-      neLog(.info, message: "Start tunnel")
-      
+
+      log(.info, message: "PacketTunnelProvider startTunnel")
+
       if let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol {
         let providerConfiguration = protocolConfiguration.providerConfiguration
         if (providerConfiguration?[Constants.ovpnConfigKey] as? Data) != nil {
@@ -106,7 +116,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
       } else {
         self.protoType = .none
       }
-      
+
       switch self.protoType {
       case .wireguard:
         self.startWireguard(activationAttemptId: activationAttemptId,
@@ -122,7 +132,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
       }
     }
   }
-  
+
   override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
     dispatchQueue.async {
       switch self.protoType {
@@ -138,7 +148,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
       }
     }
   }
-  
+
   func handleStatusAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
     switch protoType {
     case .wireguard:
@@ -152,18 +162,283 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
       break
     }
   }
-  
+
+  // MARK: Private methods
+  private func startWireguard(activationAttemptId: String?,
+                              errorNotifier: ErrorNotifier,
+                              completionHandler: @escaping (Error?) -> Void) {
+    guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
+          let providerConfiguration = protocolConfiguration.providerConfiguration,
+          let wgConfig: Data = providerConfiguration[Constants.wireGuardConfigKey] as? Data else {
+      wg_log(.error, message: "Can't start WireGuard config missing")
+      completionHandler(nil)
+      return
+    }
+
+    guard let wgConfigStr = try? JSONDecoder().decode(WGConfig.self, from: wgConfig).wg,
+          let tunnelConfiguration = try? TunnelConfiguration(fromWgQuickConfig: wgConfigStr)
+    else {
+      wg_log(.error, message: "Can't parse WireGuard config")
+      completionHandler(nil)
+      return
+    }
+
+    log(.info, message: "wgConfig: \(wgConfigStr.replacingOccurrences(of: "\n", with: " "))")
+
+    if tunnelConfiguration.peers.first!.allowedIPs
+      .map({ $0.stringRepresentation })
+      .joined(separator: ", ") == "0.0.0.0/0, ::/0" {
+      if splitTunnelType == "1" {
+        for index in tunnelConfiguration.peers.indices {
+          tunnelConfiguration.peers[index].allowedIPs.removeAll()
+          var allowedIPs = [IPAddressRange]()
+          let STSdata = Data(splitTunnelSites!.utf8)
+          do {
+            guard let STSArray = try JSONSerialization.jsonObject(with: STSdata) as? [String] else { return }
+            for allowedIPString in STSArray {
+              if let allowedIP = IPAddressRange(from: allowedIPString) {
+                allowedIPs.append(allowedIP)
+              }
+            }
+          } catch {
+            wg_log(.error, message: "Parse JSONSerialization Error")
+          }
+          tunnelConfiguration.peers[index].allowedIPs = allowedIPs
+        }
+      } else if splitTunnelType == "2" {
+        for index in tunnelConfiguration.peers.indices {
+          var excludeIPs = [IPAddressRange]()
+          let STSdata = Data(splitTunnelSites!.utf8)
+          do {
+            guard let STSArray = try JSONSerialization.jsonObject(with: STSdata) as? [String] else { return }
+            for excludeIPString in STSArray {
+              if let excludeIP = IPAddressRange(from: excludeIPString) {
+                excludeIPs.append(excludeIP)
+              }
+            }
+          } catch {
+            wg_log(.error, message: "Parse JSONSerialization Error")
+          }
+          tunnelConfiguration.peers[index].excludeIPs = excludeIPs
+        }
+      }
+    }
+
+    wg_log(.info, message: "Starting wireguard tunnel from the " +
+           (activationAttemptId == nil ? "OS directly, rather than the app" : "app"))
+
+    // Start the tunnel
+    wgAdapter.start(tunnelConfiguration: tunnelConfiguration) { adapterError in
+      guard let adapterError else {
+        let interfaceName = self.wgAdapter.interfaceName ?? "unknown"
+        wg_log(.info, message: "Tunnel interface is \(interfaceName)")
+        completionHandler(nil)
+        return
+      }
+
+      switch adapterError {
+      case .cannotLocateTunnelFileDescriptor:
+        wg_log(.error, staticMessage: "Starting tunnel failed: could not determine file descriptor")
+        errorNotifier.notify(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
+        completionHandler(PacketTunnelProviderError.couldNotDetermineFileDescriptor)
+      case .dnsResolution(let dnsErrors):
+        let hostnamesWithDnsResolutionFailure = dnsErrors.map { $0.address }
+          .joined(separator: ", ")
+        wg_log(.error, message:
+                "DNS resolution failed for the following hostnames: \(hostnamesWithDnsResolutionFailure)")
+        errorNotifier.notify(PacketTunnelProviderError.dnsResolutionFailure)
+        completionHandler(PacketTunnelProviderError.dnsResolutionFailure)
+      case .setNetworkSettings(let error):
+        wg_log(.error, message:
+                "Starting tunnel failed with setTunnelNetworkSettings returning \(error.localizedDescription)")
+        errorNotifier.notify(PacketTunnelProviderError.couldNotSetNetworkSettings)
+        completionHandler(PacketTunnelProviderError.couldNotSetNetworkSettings)
+      case .startWireGuardBackend(let errorCode):
+        wg_log(.error, message: "Starting tunnel failed with wgTurnOn returning \(errorCode)")
+        errorNotifier.notify(PacketTunnelProviderError.couldNotStartBackend)
+        completionHandler(PacketTunnelProviderError.couldNotStartBackend)
+      case .invalidState:
+        fatalError()
+      }
+    }
+  }
+
+  private func startOpenVPN(completionHandler: @escaping (Error?) -> Void) {
+    guard let protocolConfiguration = self.protocolConfiguration as? NETunnelProviderProtocol,
+          let providerConfiguration = protocolConfiguration.providerConfiguration,
+          let ovpnConfiguration: Data = providerConfiguration[Constants.ovpnConfigKey] as? Data else {
+
+      wg_log(.error, message: "Can't start startOpenVPN()")
+      return
+    }
+
+    setupAndlaunchOpenVPN(withConfig: ovpnConfiguration, completionHandler: completionHandler)
+  }
+
+  private func stopWireguard(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
+    wg_log(.info, staticMessage: "Stopping tunnel")
+
+    wgAdapter.stop { error in
+      ErrorNotifier.removeLastErrorFile()
+
+      if let error {
+        wg_log(.error, message: "Failed to stop WireGuard adapter: \(error.localizedDescription)")
+      }
+      completionHandler()
+
+#if os(macOS)
+      // HACK: This is a filthy hack to work around Apple bug 32073323 (dup'd by us as 47526107).
+      // Remove it when they finally fix this upstream and the fix has been rolled out to
+      // sufficient quantities of users.
+      exit(0)
+#endif
+    }
+  }
+
+  private func stopOpenVPN(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
+    stopHandler = completionHandler
+    if vpnReachability.isTracking {
+      vpnReachability.stopTracking()
+    }
+    ovpnAdapter.disconnect()
+  }
+
+  func handleWireguardStatusMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
+    guard let completionHandler = completionHandler else { return }
+    wgAdapter.getRuntimeConfiguration { settings in
+      var data: Data?
+      if let settings {
+        data = settings.data(using: .utf8)!
+      }
+
+      let components = settings!.components(separatedBy: "\n")
+
+      var settingsDictionary: [String: String] = [:]
+      for component in components {
+        let pair = component.components(separatedBy: "=")
+        if pair.count == 2 {
+          settingsDictionary[pair[0]] = pair[1]
+        }
+      }
+
+      let response: [String: Any] = [
+        "rx_bytes": settingsDictionary["rx_bytes"] ?? "0",
+        "tx_bytes": settingsDictionary["tx_bytes"] ?? "0"
+      ]
+
+      completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
+    }
+  }
+
+  private func handleWireguardAppMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
+    guard let completionHandler = completionHandler else { return }
+    if messageData.count == 1 && messageData[0] == 0 {
+      wgAdapter.getRuntimeConfiguration { settings in
+        var data: Data?
+        if let settings {
+          data = settings.data(using: .utf8)!
+        }
+        completionHandler(data)
+      }
+    } else if messageData.count >= 1 {
+      // Updates the tunnel configuration and responds with the active configuration
+      wg_log(.info, message: "Switching tunnel configuration")
+      guard let configString = String(data: messageData, encoding: .utf8)
+      else {
+        completionHandler(nil)
+        return
+      }
+
+      do {
+        let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: configString)
+        wgAdapter.update(tunnelConfiguration: tunnelConfiguration) { error in
+          if let error {
+            wg_log(.error, message: "Failed to switch tunnel configuration: \(error.localizedDescription)")
+            completionHandler(nil)
+            return
+          }
+
+          self.wgAdapter.getRuntimeConfiguration { settings in
+            var data: Data?
+            if let settings {
+              data = settings.data(using: .utf8)!
+            }
+            completionHandler(data)
+          }
+        }
+      } catch {
+        completionHandler(nil)
+      }
+    } else {
+      completionHandler(nil)
+    }
+  }
+
+  private func handleOpenVPNStatusMessage(_ messageData: Data, completionHandler: ((Data?) -> Void)? = nil) {
+    guard let completionHandler = completionHandler else { return }
+    let bytesin = ovpnAdapter.transportStatistics.bytesIn
+    let bytesout = ovpnAdapter.transportStatistics.bytesOut
+
+    let response: [String: Any] = [
+      "rx_bytes": bytesin,
+      "tx_bytes": bytesout
+    ]
+
+    completionHandler(try? JSONSerialization.data(withJSONObject: response, options: []))
+  }
+
+  private func setupAndlaunchOpenVPN(withConfig ovpnConfiguration: Data,
+                                     withShadowSocks viaSS: Bool = false,
+                                     completionHandler: @escaping (Error?) -> Void) {
+    wg_log(.info, message: "setupAndlaunchOpenVPN")
+
+    let str = String(decoding: ovpnConfiguration, as: UTF8.self)
+
+    let configuration = OpenVPNConfiguration()
+    configuration.fileContent = ovpnConfiguration
+    if str.contains("cloak") {
+      configuration.setPTCloak()
+    }
+
+    let evaluation: OpenVPNConfigurationEvaluation
+    do {
+      evaluation = try ovpnAdapter.apply(configuration: configuration)
+
+    } catch {
+      completionHandler(error)
+      return
+    }
+
+    if !evaluation.autologin {
+      wg_log(.info, message: "Implement login with user credentials")
+    }
+
+    vpnReachability.startTracking { [weak self] status in
+      guard status == .reachableViaWiFi else { return }
+      self?.ovpnAdapter.reconnect(afterTimeInterval: 5)
+    }
+
+    startHandler = completionHandler
+    ovpnAdapter.connect(using: packetFlow)
+
+    //        let ifaces = Interface.allInterfaces()
+    //            .filter { $0.family == .ipv4 }
+    //            .map { iface in iface.name }
+
+    //        wg_log(.error, message: "Available TUN Interfaces: \(ifaces)")
+  }
+
   // MARK: Network observing methods
-  
+
   private func startListeningForNetworkChanges() {
     stopListeningForNetworkChanges()
     addObserver(self, forKeyPath: Constants.kDefaultPathKey, options: .old, context: nil)
   }
-  
+
   private func stopListeningForNetworkChanges() {
     removeObserver(self, forKeyPath: Constants.kDefaultPathKey)
   }
-  
+
   override func observeValue(forKeyPath keyPath: String?,
                              of object: Any?,
                              change: [NSKeyValueChangeKey: Any]?,
@@ -183,13 +458,48 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
       self.handle(networkChange: self.defaultPath!) { _ in }
     }
   }
-  
+
   private func handle(networkChange changePath: NWPath, completion: @escaping (Error?) -> Void) {
     wg_log(.info, message: "Tunnel restarted.")
     startTunnel(options: nil, completionHandler: completion)
   }
+
+  private func startEmptyTunnel(completionHandler: @escaping (Error?) -> Void) {
+    dispatchPrecondition(condition: .onQueue(dispatchQueue))
+
+    let emptyTunnelConfiguration = TunnelConfiguration(
+      name: nil,
+      interface: InterfaceConfiguration(privateKey: PrivateKey()),
+      peers: []
+    )
+
+    wgAdapter.start(tunnelConfiguration: emptyTunnelConfiguration) { error in
+      self.dispatchQueue.async {
+        if let error {
+          log(.error, message: "Failed to start an empty tunnel")
+          completionHandler(error)
+        } else {
+          log(.info, message: "Started an empty tunnel")
+          self.tunnelAdapterDidStart()
+        }
+      }
+    }
+
+    let settings = NETunnelNetworkSettings(tunnelRemoteAddress: "1.1.1.1")
+
+    self.setTunnelNetworkSettings(settings) { error in
+      completionHandler(error)
+    }
+  }
+
+  private func tunnelAdapterDidStart() {
+    dispatchPrecondition(condition: .onQueue(dispatchQueue))
+    // ...
+  }
 }
 
+extension NEPacketTunnelFlow: OpenVPNAdapterPacketFlow {}
+
 extension WireGuardLogLevel {
   var osLogLevel: OSLogType {
     switch self {

client/platforms/ios/QtAppDelegate.h

@@ -1,7 +1,4 @@
 #import <UIKit/UIKit.h>
 
-@interface QIOSApplicationDelegate
-@end
-
-@interface QIOSApplicationDelegate (AmneziaVPNDelegate)
+@interface QtAppDelegate : UIResponder <UIApplicationDelegate>
 @end

client/platforms/ios/QtAppDelegate.mm

@@ -3,17 +3,41 @@
 
 #include <QFile>
 
+@implementation QtAppDelegate {
+    UIView *_screen;
+}
+
++(QtAppDelegate *)sharedQtAppDelegate {
+    static dispatch_once_t pred;
+    static QtAppDelegate *shared = nil;
+    dispatch_once(&pred, ^{
+        shared = [[super alloc] init];
+    });
+    return shared;
+}
 
-@implementation QIOSApplicationDelegate (AmneziaVPNDelegate)
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     [application setMinimumBackgroundFetchInterval: UIApplicationBackgroundFetchIntervalMinimum];
     // Override point for customization after application launch.
-    NSLog(@"Application didFinishLaunchingWithOptions");
+    NSLog(@"Did this launch option happen");
     return YES;
 }
 
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
+    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
+    _screen = [UIScreen.mainScreen snapshotViewAfterScreenUpdates: false];
+    UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle: UIBlurEffectStyleDark];
+    UIVisualEffectView *blurBackground = [[UIVisualEffectView alloc] initWithEffect: blurEffect];
+    [_screen addSubview: blurBackground];
+    blurBackground.frame = _screen.frame;
+    UIWindow *_window = UIApplication.sharedApplication.keyWindow;
+    [_window addSubview: _screen];
+}
+
 - (void)applicationDidEnterBackground:(UIApplication *)application
 {
     // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
@@ -27,6 +51,17 @@
     NSLog(@"In the foreground");
 }
 
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+    [_screen removeFromSuperview];
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+}
+
 -(void)application:(UIApplication *)application performFetchWithCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
     // We will add content here soon.
     NSLog(@"In the completionHandler");
@@ -35,27 +70,31 @@
 - (BOOL)application:(UIApplication *)app
             openURL:(NSURL *)url
             options:(NSDictionary<UIApplicationOpenURLOptionsKey, id> *)options {
+    
+    NSLog(@"Application openURL: %@", url);
     if (url.fileURL) {
         QString filePath(url.path.UTF8String);
         if (filePath.isEmpty()) return NO;
 
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-            NSLog(@"Application openURL: %@", url);
-
-            if (filePath.contains("backup")) {
-                IosController::Instance()->importBackupFromOutside(filePath);
-            } else {
-                QFile file(filePath);
-                bool isOpenFile = file.open(QIODevice::ReadOnly);
-                QByteArray data = file.readAll();
-
-                IosController::Instance()->importConfigFromOutside(QString(data));
-            }
-        });
-
+        if (filePath.contains("backup")) {
+            IosController::Instance()->importBackupFromOutside(filePath);
+        } else {
+            QFile file(filePath);
+            bool isOpenFile = file.open(QIODevice::ReadOnly);
+            QByteArray data = file.readAll();
+            
+            IosController::Instance()->importConfigFromOutside(QString(data));
+        }
         return YES;
     }
     return NO;
 }
 
+
+void QtAppDelegateInitialize()
+{
+    [[UIApplication sharedApplication] setDelegate: [QtAppDelegate sharedQtAppDelegate]];
+    NSLog(@"Created a new AppDelegate");
+}
+
 @end

client/platforms/ios/ScreenProtection.swift

@@ -1,87 +0,0 @@
-import UIKit
-
-public func toggleScreenshots(_ isEnabled: Bool) {
-  let window = UIApplication.shared.keyWindows.first!
-
-  if isEnabled {
-    ScreenProtection.shared.disable(for: window.rootViewController!.view)
-  } else {
-    ScreenProtection.shared.enable(for: window.rootViewController!.view)
-  }
-}
-
-extension UIApplication {
-  var keyWindows: [UIWindow] {
-    connectedScenes
-      .compactMap {
-        if #available(iOS 15.0, *) {
-          ($0 as? UIWindowScene)?.keyWindow
-        } else {
-          ($0 as? UIWindowScene)?.windows.first { $0.isKeyWindow }
-        }
-      }
-  }
-}
-
-class ScreenProtection {
-  public static let shared = ScreenProtection()
-
-  var pairs = [ProtectionPair]()
-
-  private var blurView: UIVisualEffectView?
-  private var recordingObservation: NSKeyValueObservation?
-
-  public func enable(for view: UIView) {
-    DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-      view.subviews.forEach {
-        self.pairs.append(ProtectionPair(from: $0))
-      }
-    }
-  }
-
-  public func disable(for view: UIView) {
-    DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-      self.pairs.forEach {
-        $0.removeProtection()
-      }
-
-      self.pairs.removeAll()
-    }
-  }
-}
-
-struct ProtectionPair {
-  let textField: UITextField
-  let layer: CALayer
-
-  init(from view: UIView) {
-    let secureTextField = UITextField()
-    secureTextField.backgroundColor = .clear
-    secureTextField.translatesAutoresizingMaskIntoConstraints = false
-    secureTextField.isSecureTextEntry = true
-
-    view.insertSubview(secureTextField, at: 0)
-    secureTextField.isUserInteractionEnabled = false
-
-    view.layer.superlayer?.addSublayer(secureTextField.layer)
-    secureTextField.layer.sublayers?.last?.addSublayer(view.layer)
-
-    secureTextField.topAnchor.constraint(equalTo: view.topAnchor, constant: 0).isActive = true
-    secureTextField.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: 0).isActive = true
-    secureTextField.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0).isActive = true
-    secureTextField.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0).isActive = true
-
-    self.init(textField: secureTextField, layer: view.layer)
-  }
-
-  init(textField: UITextField, layer: CALayer) {
-    self.textField = textField
-    self.layer = layer
-  }
-
-  func removeProtection() {
-    textField.superview?.superview?.layer.addSublayer(layer)
-    textField.layer.removeFromSuperlayer()
-    textField.removeFromSuperview()
-  }
-}

client/platforms/ios/WGConfig.swift

@@ -1,91 +1,133 @@
 import Foundation
 
-struct WGConfig: Decodable {
-  let initPacketMagicHeader, responsePacketMagicHeader: String?
-  let underloadPacketMagicHeader, transportPacketMagicHeader: String?
-  let junkPacketCount, junkPacketMinSize, junkPacketMaxSize: String?
-  let initPacketJunkSize, responsePacketJunkSize: String?
-  let dns1: String
-  let dns2: String
-  let mtu: String
-  let hostName: String
-  let port: Int
-  let clientIP: String
-  let clientPrivateKey: String
-  let serverPublicKey: String
-  let presharedKey: String
-  var allowedIPs: [String]
-  var persistentKeepAlive: String
-  let splitTunnelType: Int
-  let splitTunnelSites: [String]
-
-  enum CodingKeys: String, CodingKey {
-    case initPacketMagicHeader = "H1", responsePacketMagicHeader = "H2"
-    case underloadPacketMagicHeader = "H3", transportPacketMagicHeader = "H4"
-    case junkPacketCount = "Jc", junkPacketMinSize = "Jmin", junkPacketMaxSize = "Jmax"
-    case initPacketJunkSize = "S1", responsePacketJunkSize = "S2"
-    case dns1
-    case dns2
-    case mtu
-    case hostName
-    case port
-    case clientIP = "client_ip"
-    case clientPrivateKey = "client_priv_key"
-    case serverPublicKey = "server_pub_key"
-    case presharedKey = "psk_key"
-    case allowedIPs = "allowed_ips"
-    case persistentKeepAlive = "persistent_keep_alive"
-    case splitTunnelType
-    case splitTunnelSites
-  }
+struct WGConfigData: Decodable {
+  let h1, h2, h3, h4: String?
+  let jc, jmax, jmin: String?
+  let s1, s2: String?
 
   var settings: String {
-    junkPacketCount == nil ? "" :
+    jc == nil ? "" :
     """
-    Jc = \(junkPacketCount!)
-    Jmin = \(junkPacketMinSize!)
-    Jmax = \(junkPacketMaxSize!)
-    S1 = \(initPacketJunkSize!)
-    S2 = \(responsePacketJunkSize!)
-    H1 = \(initPacketMagicHeader!)
-    H2 = \(responsePacketMagicHeader!)
-    H3 = \(underloadPacketMagicHeader!)
-    H4 = \(transportPacketMagicHeader!)
+    Jc = \(jc!)
+    Jmin = \(jmin!)
+    Jmax = \(jmax!)
+    S1 = \(s1!)
+    S2 = \(s2!)
+    H1 = \(h1!)
+    H2 = \(h2!)
+    H3 = \(h3!)
+    H4 = \(h4!)
 
     """
   }
 
-  var str: String {
-    """
-    [Interface]
-    Address = \(clientIP)
-    DNS = \(dns1), \(dns2)
-    MTU = \(mtu)
-    PrivateKey = \(clientPrivateKey)
-    \(settings)
-    [Peer]
-    PublicKey = \(serverPublicKey)
-    PresharedKey = \(presharedKey)
-    AllowedIPs = \(allowedIPs.joined(separator: ", "))
-    Endpoint = \(hostName):\(port)
-    PersistentKeepalive = \(persistentKeepAlive)
-    """
+  let clientIP: String
+  let clientPrivateKey: String
+  let clientPublicKey: String
+  let serverPublicKey: String
+  let presharedKey: String
+  let hostName: String
+  let port: Int
+
+  var allowedIPs: [String]
+  var persistentKeepAlive: String
+
+  enum CodingKeys: String, CodingKey {
+    case h1 = "H1", h2 = "H2", h3 = "H3", h4 = "H4"
+    case jc = "Jc", jmax = "Jmax", jmin = "Jmin"
+    case s1 = "S1", s2 = "S2"
+
+    case clientIP = "client_ip" // "10.8.1.16"
+    case clientPrivateKey = "client_priv_key"
+    case clientPublicKey = "client_pub_key"
+    case serverPublicKey = "server_pub_key"
+    case presharedKey = "psk_key"
+
+    case allowedIPs = "allowed_ips"
+    case persistentKeepAlive = "persistent_keep_alive"
+    case hostName
+    case port
   }
 
-  var redux: String {
+  init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+    self.h1 = try container.decodeIfPresent(String.self, forKey: .h1)
+    self.h2 = try container.decodeIfPresent(String.self, forKey: .h2)
+    self.h3 = try container.decodeIfPresent(String.self, forKey: .h3)
+    self.h4 = try container.decodeIfPresent(String.self, forKey: .h4)
+    self.jc = try container.decodeIfPresent(String.self, forKey: .jc)
+    self.jmax = try container.decodeIfPresent(String.self, forKey: .jmax)
+    self.jmin = try container.decodeIfPresent(String.self, forKey: .jmin)
+    self.s1 = try container.decodeIfPresent(String.self, forKey: .s1)
+    self.s2 = try container.decodeIfPresent(String.self, forKey: .s2)
+    self.clientIP = try container.decode(String.self, forKey: .clientIP)
+    self.clientPrivateKey = try container.decode(String.self, forKey: .clientPrivateKey)
+    self.clientPublicKey = try container.decode(String.self, forKey: .clientPublicKey)
+    self.serverPublicKey = try container.decode(String.self, forKey: .serverPublicKey)
+    self.presharedKey = try container.decode(String.self, forKey: .presharedKey)
+    self.allowedIPs = try container.decodeIfPresent([String].self, forKey: .allowedIPs) ?? ["0.0.0.0/0", "::/0"]
+    self.persistentKeepAlive = try container.decodeIfPresent(String.self, forKey: .persistentKeepAlive) ?? "25"
+    self.hostName = try container.decode(String.self, forKey: .hostName)
+    self.port = try container.decode(Int.self, forKey: .port)
+  }
+}
+
+struct WGConfig: Decodable {
+  let data: WGConfigData
+  let configVersion: Int
+  let description: String
+  let dns1: String
+  let dns2: String
+  let hostName: String
+  let `protocol`: String
+  let splitTunnelSites: [String]
+  let splitTunnelType: Int
+
+  enum CodingKeys: String, CodingKey {
+    case awgConfigData = "awg_config_data", wgConfigData = "wireguard_config_data"
+    case configData
+    case configVersion = "config_version"
+    case description
+    case dns1
+    case dns2
+    case hostName
+    case `protocol`
+    case splitTunnelSites
+    case splitTunnelType
+  }
+
+  init(from decoder: Decoder) throws {
+    let container = try decoder.container(keyedBy: CodingKeys.self)
+
+    if container.contains(.awgConfigData) {
+      self.data = try container.decode(WGConfigData.self, forKey: .awgConfigData)
+    } else {
+      self.data = try container.decode(WGConfigData.self, forKey: .wgConfigData)
+    }
+
+    self.configVersion = try container.decode(Int.self, forKey: .configVersion)
+    self.description = try container.decode(String.self, forKey: .description)
+    self.dns1 = try container.decode(String.self, forKey: .dns1)
+    self.dns2 = try container.decode(String.self, forKey: .dns2)
+    self.hostName = try container.decode(String.self, forKey: .hostName)
+    self.protocol = try container.decode(String.self, forKey: .protocol)
+    self.splitTunnelSites = try container.decode([String].self, forKey: .splitTunnelSites)
+    self.splitTunnelType = try container.decode(Int.self, forKey: .splitTunnelType)
+  }
+
+  var wg: String {
     """
     [Interface]
-    Address = \(clientIP)
+    Address = \(data.clientIP)/32
     DNS = \(dns1), \(dns2)
-    MTU = \(mtu)
-    PrivateKey = ***
-    \(settings)
+    PrivateKey = \(data.clientPrivateKey)
+    \(data.settings)
     [Peer]
-    PublicKey = ***
-    PresharedKey = ***
-    AllowedIPs = \(allowedIPs.joined(separator: ", "))
-    Endpoint = \(hostName):\(port)
-    PersistentKeepalive = \(persistentKeepAlive)
+    PublicKey = \(data.serverPublicKey)
+    PresharedKey = \(data.presharedKey)
+    AllowedIPs = \(data.allowedIPs.joined(separator: ", "))
+    Endpoint = \(data.hostName):\(data.port)
+    PersistentKeepalive = \(data.persistentKeepAlive)
     """
   }
 }

client/platforms/ios/ios_controller.mm

@@ -235,6 +235,7 @@ void IosController::checkStatus()
         m_rxBytes = rxBytes;
         m_txBytes = txBytes;
     });
+    
 }
 
 void IosController::vpnStatusDidChange(void *pNotification)
@@ -243,13 +244,13 @@ void IosController::vpnStatusDidChange(void *pNotification)
 
     if (session /* && session == TunnelManager.session */ ) {
         qDebug() << "IosController::vpnStatusDidChange" << iosStatusToState(session.status) << session;
-
+       
         if (session.status == NEVPNStatusDisconnected) {
             if (@available(iOS 16.0, *)) {
                 [session fetchLastDisconnectErrorWithCompletionHandler:^(NSError * _Nullable error) {
                     if (error != nil) {
                         qDebug() << "Disconnect error" << error.domain << error.code << error.localizedDescription;
-
+                        
                         if ([error.domain isEqualToString:NEVPNConnectionErrorDomain]) {
                             switch (error.code) {
                                 case NEVPNConnectionErrorOverslept:
@@ -314,11 +315,11 @@ void IosController::vpnStatusDidChange(void *pNotification)
                                     break;
                             }
                         }
-
+                        
                         NSError *underlyingError = error.userInfo[@"NSUnderlyingError"];
                         if (underlyingError != nil) {
                             qDebug() << "Disconnect underlying error" << underlyingError.domain << underlyingError.code << underlyingError.localizedDescription;
-
+                            
                             if ([underlyingError.domain isEqualToString:@"NEAgentErrorDomain"]) {
                                 switch (underlyingError.code) {
                                     case 1:
@@ -341,7 +342,7 @@ void IosController::vpnStatusDidChange(void *pNotification)
                 qDebug() << "Disconnect error is unavailable on iOS < 16.0";
             }
         }
-
+        
         emit connectionStateChanged(iosStatusToState(session.status));
     }
 }
@@ -356,29 +357,7 @@ bool IosController::setupOpenVPN()
     QJsonObject ovpn = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::OpenVpn)].toObject();
     QString ovpnConfig = ovpn[config_key::config].toString();
 
-    QJsonObject openVPNConfig {};
-    openVPNConfig.insert(config_key::config, ovpnConfig);
-
-    if (ovpn.contains(config_key::mtu)) {
-        openVPNConfig.insert(config_key::mtu, ovpn[config_key::mtu]);
-    } else {
-        openVPNConfig.insert(config_key::mtu, protocols::openvpn::defaultMtu);
-    }
-
-    openVPNConfig.insert(config_key::splitTunnelType, m_rawConfig[config_key::splitTunnelType]);
-
-    QJsonArray splitTunnelSites = m_rawConfig[config_key::splitTunnelSites].toArray();
-
-    for(int index = 0; index < splitTunnelSites.count(); index++) {
-        splitTunnelSites[index] = splitTunnelSites[index].toString().remove(" ");
-    }
-
-    openVPNConfig.insert(config_key::splitTunnelSites, splitTunnelSites);
-
-    QJsonDocument openVPNConfigDoc(openVPNConfig);
-    QString openVPNConfigStr(openVPNConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startOpenVPN(openVPNConfigStr);
+    return startOpenVPN(ovpnConfig);
 }
 
 bool IosController::setupCloak()
@@ -415,137 +394,27 @@ bool IosController::setupCloak()
     ovpnConfig.append(cloakBase64);
     ovpnConfig.append("\n</cloak>\n");
 
-    QJsonObject openVPNConfig {};
-    openVPNConfig.insert(config_key::config, ovpnConfig);
-
-    if (ovpn.contains(config_key::mtu)) {
-        openVPNConfig.insert(config_key::mtu, ovpn[config_key::mtu]);
-    } else {
-        openVPNConfig.insert(config_key::mtu, protocols::openvpn::defaultMtu);
-    }
-
-    QJsonArray splitTunnelSites = m_rawConfig[config_key::splitTunnelSites].toArray();
-
-    for(int index = 0; index < splitTunnelSites.count(); index++) {
-        splitTunnelSites[index] = splitTunnelSites[index].toString().remove(" ");
-    }
-
-    openVPNConfig.insert(config_key::splitTunnelSites, splitTunnelSites);
-
-    QJsonDocument openVPNConfigDoc(openVPNConfig);
-    QString openVPNConfigStr(openVPNConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startOpenVPN(openVPNConfigStr);
+    return startOpenVPN(ovpnConfig);
 }
 
 bool IosController::setupWireGuard()
 {
     QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::WireGuard)].toObject();
+    
+    QJsonDocument doc(m_rawConfig);
+    QString wgConfig(doc.toJson(QJsonDocument::Compact));
 
-    QJsonObject wgConfig {};
-    wgConfig.insert(config_key::dns1, m_rawConfig[config_key::dns1]);
-    wgConfig.insert(config_key::dns2, m_rawConfig[config_key::dns2]);
-
-    if (config.contains(config_key::mtu)) {
-        wgConfig.insert(config_key::mtu, config[config_key::mtu]);
-    } else {
-        wgConfig.insert(config_key::mtu, protocols::wireguard::defaultMtu);
-    }
-
-    wgConfig.insert(config_key::hostName, config[config_key::hostName]);
-    wgConfig.insert(config_key::port, config[config_key::port]);
-    wgConfig.insert(config_key::client_ip, config[config_key::client_ip]);
-    wgConfig.insert(config_key::client_priv_key, config[config_key::client_priv_key]);
-    wgConfig.insert(config_key::server_pub_key, config[config_key::server_pub_key]);
-    wgConfig.insert(config_key::psk_key, config[config_key::psk_key]);
-    wgConfig.insert(config_key::splitTunnelType, m_rawConfig[config_key::splitTunnelType]);
-
-    QJsonArray splitTunnelSites = m_rawConfig[config_key::splitTunnelSites].toArray();
-
-    for(int index = 0; index < splitTunnelSites.count(); index++) {
-        splitTunnelSites[index] = splitTunnelSites[index].toString().remove(" ");
-    }
-
-    wgConfig.insert(config_key::splitTunnelSites, splitTunnelSites);
-
-    if (config.contains(config_key::allowed_ips) && config[config_key::allowed_ips].isArray()) {
-        wgConfig.insert(config_key::allowed_ips, config[config_key::allowed_ips]);
-    } else {
-        QJsonArray allowed_ips { "0.0.0.0/0", "::/0" };
-        wgConfig.insert(config_key::allowed_ips, allowed_ips);
-    }
-
-    if (config.contains(config_key::persistent_keep_alive)) {
-        wgConfig.insert(config_key::persistent_keep_alive, config[config_key::persistent_keep_alive]);
-    } else {
-        wgConfig.insert(config_key::persistent_keep_alive, "25");
-    }
-
-    QJsonDocument wgConfigDoc(wgConfig);
-    QString wgConfigDocStr(wgConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startWireGuard(wgConfigDocStr);
+    return startWireGuard(wgConfig);
 }
 
 bool IosController::setupAwg()
 {
     QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::Awg)].toObject();
 
-    QJsonObject wgConfig {};
-    wgConfig.insert(config_key::dns1, m_rawConfig[config_key::dns1]);
-    wgConfig.insert(config_key::dns2, m_rawConfig[config_key::dns2]);
+    QJsonDocument doc(m_rawConfig);
+    QString wgConfig(doc.toJson(QJsonDocument::Compact));
 
-    if (config.contains(config_key::mtu)) {
-        wgConfig.insert(config_key::mtu, config[config_key::mtu]);
-    } else {
-        wgConfig.insert(config_key::mtu, protocols::awg::defaultMtu);
-    }
-
-    wgConfig.insert(config_key::hostName, config[config_key::hostName]);
-    wgConfig.insert(config_key::port, config[config_key::port]);
-    wgConfig.insert(config_key::client_ip, config[config_key::client_ip]);
-    wgConfig.insert(config_key::client_priv_key, config[config_key::client_priv_key]);
-    wgConfig.insert(config_key::server_pub_key, config[config_key::server_pub_key]);
-    wgConfig.insert(config_key::psk_key, config[config_key::psk_key]);
-    wgConfig.insert(config_key::splitTunnelType, m_rawConfig[config_key::splitTunnelType]);
-
-    QJsonArray splitTunnelSites = m_rawConfig[config_key::splitTunnelSites].toArray();
-
-    for(int index = 0; index < splitTunnelSites.count(); index++) {
-        splitTunnelSites[index] = splitTunnelSites[index].toString().remove(" ");
-    }
-
-    wgConfig.insert(config_key::splitTunnelSites, splitTunnelSites);
-
-    if (config.contains(config_key::allowed_ips) && config[config_key::allowed_ips].isArray()) {
-        wgConfig.insert(config_key::allowed_ips, config[config_key::allowed_ips]);
-    } else {
-        QJsonArray allowed_ips { "0.0.0.0/0", "::/0" };
-        wgConfig.insert(config_key::allowed_ips, allowed_ips);
-    }
-
-    if (config.contains(config_key::persistent_keep_alive)) {
-        wgConfig.insert(config_key::persistent_keep_alive, config[config_key::persistent_keep_alive]);
-    } else {
-        wgConfig.insert(config_key::persistent_keep_alive, "25");
-    }
-
-    wgConfig.insert(config_key::initPacketMagicHeader, config[config_key::initPacketMagicHeader]);
-    wgConfig.insert(config_key::responsePacketMagicHeader, config[config_key::responsePacketMagicHeader]);
-    wgConfig.insert(config_key::underloadPacketMagicHeader, config[config_key::underloadPacketMagicHeader]);
-    wgConfig.insert(config_key::transportPacketMagicHeader, config[config_key::transportPacketMagicHeader]);
-
-    wgConfig.insert(config_key::initPacketJunkSize, config[config_key::initPacketJunkSize]);
-    wgConfig.insert(config_key::responsePacketJunkSize, config[config_key::responsePacketJunkSize]);
-
-    wgConfig.insert(config_key::junkPacketCount, config[config_key::junkPacketCount]);
-    wgConfig.insert(config_key::junkPacketMinSize, config[config_key::junkPacketMinSize]);
-    wgConfig.insert(config_key::junkPacketMaxSize, config[config_key::junkPacketMaxSize]);
-
-    QJsonDocument wgConfigDoc(wgConfig);
-    QString wgConfigDocStr(wgConfigDoc.toJson(QJsonDocument::Compact));
-
-    return startWireGuard(wgConfigDocStr);
+    return startWireGuard(wgConfig);
 }
 
 bool IosController::startOpenVPN(const QString &config)
@@ -579,17 +448,23 @@ bool IosController::startWireGuard(const QString &config)
 void IosController::startTunnel()
 {
     NSString *protocolName = @"Unknown";
-
+    
     NETunnelProviderProtocol *tunnelProtocol = (NETunnelProviderProtocol *)m_currentTunnel.protocolConfiguration;
     if (tunnelProtocol.providerConfiguration[@"wireguard"] != nil) {
         protocolName = @"WireGuard";
     } else if (tunnelProtocol.providerConfiguration[@"ovpn"] != nil) {
         protocolName = @"OpenVPN";
     }
-
+    
     m_rxBytes = 0;
     m_txBytes = 0;
-
+    
+    int STT = m_rawConfig["splitTunnelType"].toInt();
+    QJsonArray splitTunnelSites = m_rawConfig["splitTunnelSites"].toArray();
+    QJsonDocument doc;
+    doc.setArray(splitTunnelSites);
+    QString STS(doc.toJson());
+    
     [m_currentTunnel setEnabled:YES];
 
     [m_currentTunnel saveToPreferencesWithCompletionHandler:^(NSError *saveError) {
@@ -610,6 +485,23 @@ void IosController::startTunnel()
                     NSError *startError = nil;
                     qDebug() << iosStatusToState(m_currentTunnel.connection.status);
 
+
+                    NSString *actionKey = [NSString stringWithUTF8String:MessageKey::action];
+                    NSString *actionValue = [NSString stringWithUTF8String:Action::start];
+                    NSString *tunnelIdKey = [NSString stringWithUTF8String:MessageKey::tunnelId];
+                    NSString *tunnelIdValue = !m_tunnelId.isEmpty() ? m_tunnelId.toNSString() : @"";
+                    NSString *SplitTunnelTypeKey = [NSString stringWithUTF8String:MessageKey::SplitTunnelType];
+                    NSString *SplitTunnelTypeValue = [NSString stringWithFormat:@"%d",STT];
+                    NSString *SplitTunnelSitesKey = [NSString stringWithUTF8String:MessageKey::SplitTunnelSites];
+                    NSString *SplitTunnelSitesValue = STS.toNSString();
+                
+
+                    NSDictionary* message = @{actionKey: actionValue, tunnelIdKey: tunnelIdValue,
+                    SplitTunnelTypeKey: SplitTunnelTypeValue, SplitTunnelSitesKey: SplitTunnelSitesValue};
+                
+                    sendVpnExtensionMessage(message);
+
+
                     BOOL started = [m_currentTunnel.connection startVPNTunnelWithOptions:nil andReturnError:&startError];
 
                     if (!started || startError) {
@@ -624,6 +516,7 @@ void IosController::startTunnel()
     }];
 }
 
+
 bool IosController::isOurManager(NETunnelProviderManager* manager) {
     NETunnelProviderProtocol* tunnelProto = (NETunnelProviderProtocol*)manager.protocolConfiguration;
 
@@ -685,7 +578,7 @@ void IosController::sendVpnExtensionMessage(NSDictionary* message, std::function
     NETunnelProviderSession *session = (NETunnelProviderSession *)m_currentTunnel.connection;
 
     NSError *sendError = nil;
-
+    
     if ([session respondsToSelector:@selector(sendProviderMessage:returnError:responseHandler:)]) {
         [session sendProviderMessage:data returnError:&sendError responseHandler:completionHandler];
     } else {

client/platforms/ios/ios_controller_wrapper.mm

@@ -21,7 +21,7 @@
 }
 
 - (void) vpnConfigurationDidChange:(NSNotification *)notification {
-//    cppController->vpnStatusDidChange(notification);
+    cppController->vpnStatusDidChange(notification);
 }
 
 

client/platforms/linux/daemon/iputilslinux.cpp

@@ -16,6 +16,9 @@
 #include "leakdetector.h"
 #include "logger.h"
 
+constexpr uint32_t ETH_MTU = 1500;
+constexpr uint32_t WG_MTU_OVERHEAD = 80;
+
 namespace {
 Logger logger("IPUtilsLinux");
 }
@@ -35,6 +38,8 @@ bool IPUtilsLinux::addInterfaceIPs(const InterfaceConfig& config) {
 }
 
 bool IPUtilsLinux::setMTUAndUp(const InterfaceConfig& config) {
+  Q_UNUSED(config);
+
   // Create socket file descriptor to perform the ioctl operations on
   int sockfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
   if (sockfd < 0) {
@@ -51,10 +56,10 @@ bool IPUtilsLinux::setMTUAndUp(const InterfaceConfig& config) {
   // FIXME: We need to know how many layers deep this particular
   // interface is into a tunnel to work effectively. Otherwise
   // we will run into fragmentation issues.
-  ifr.ifr_mtu = config.m_deviceMTU;
+  ifr.ifr_mtu = ETH_MTU - WG_MTU_OVERHEAD;
   int ret = ioctl(sockfd, SIOCSIFMTU, &ifr);
   if (ret) {
-    logger.error() << "Failed to set MTU -- " << config.m_deviceMTU << " -- Return code: " << ret;
+    logger.error() << "Failed to set MTU -- Return code: " << ret;
     return false;
   }
 

client/platforms/macos/daemon/iputilsmacos.cpp

@@ -20,6 +20,9 @@
 #include "logger.h"
 #include "macosdaemon.h"
 
+constexpr uint32_t ETH_MTU = 1500;
+constexpr uint32_t WG_MTU_OVERHEAD = 80;
+
 namespace {
 Logger logger("IPUtilsMacos");
 }
@@ -53,10 +56,10 @@ bool IPUtilsMacos::setMTUAndUp(const InterfaceConfig& config) {
 
   // MTU
   strncpy(ifr.ifr_name, qPrintable(ifname), IFNAMSIZ);
-  ifr.ifr_mtu = config.m_deviceMTU;
+  ifr.ifr_mtu = ETH_MTU - WG_MTU_OVERHEAD;
   int ret = ioctl(sockfd, SIOCSIFMTU, &ifr);
   if (ret) {
-    logger.error() << "Failed to set MTU -- " << config.m_deviceMTU << " -- Return code: " << ret;
+    logger.error() << "Failed to set MTU:" << strerror(errno);
     return false;
   }
 

client/platforms/windows/daemon/windowstunnelservice.cpp

@@ -58,6 +58,7 @@ void WindowsTunnelService::stop() {
   if (m_logworker) {
     m_logthread.quit();
     m_logthread.wait();
+    delete m_logworker;
     m_logworker = nullptr;
   }
 }
@@ -103,7 +104,6 @@ bool WindowsTunnelService::start(const QString& configData) {
 
   m_logworker = new WindowsTunnelLogger(WindowsCommons::tunnelLogFile());
   m_logworker->moveToThread(&m_logthread);
-  connect(&m_logthread, &QThread::finished, m_logworker, &QObject::deleteLater);
   m_logthread.start();
 
   SC_HANDLE scm = (SC_HANDLE)m_scm;

client/protocols/openvpnprotocol.cpp

@@ -217,7 +217,7 @@ ErrorCode OpenVpnProtocol::start()
         return ErrorCode::AmneziaServiceConnectionFailed;
     }
 
-    m_openVpnProcess->waitForSource(5000);
+    m_openVpnProcess->waitForSource(1000);
     if (!m_openVpnProcess->isInitialized()) {
         qWarning() << "IpcProcess replica is not connected!";
         setLastError(ErrorCode::AmneziaServiceConnectionFailed);

client/protocols/protocols_defs.h

@@ -20,7 +20,6 @@ namespace amnezia
         constexpr char dns1[] = "dns1";
         constexpr char dns2[] = "dns2";
 
-        constexpr char serverIndex[] = "serverIndex";
         constexpr char description[] = "description";
         constexpr char name[] = "name";
         constexpr char cert[] = "cert";
@@ -45,9 +44,7 @@ namespace amnezia
         constexpr char server_priv_key[] = "server_priv_key";
         constexpr char server_pub_key[] = "server_pub_key";
         constexpr char psk_key[] = "psk_key";
-        constexpr char mtu[] = "mtu";
         constexpr char allowed_ips[] = "allowed_ips";
-        constexpr char persistent_keep_alive[] = "persistent_keep_alive";
 
         constexpr char client_ip[] = "client_ip"; // internal ip address
 
@@ -105,7 +102,6 @@ namespace amnezia
             constexpr char defaultSubnetAddress[] = "10.8.0.0";
             constexpr char defaultSubnetMask[] = "255.255.255.0";
             constexpr char defaultSubnetCidr[] = "24";
-            constexpr char defaultMtu[] = "1500";
 
             constexpr char serverConfigPath[] = "/opt/amnezia/openvpn/server.conf";
             constexpr char caCertPath[] = "/opt/amnezia/openvpn/pki/ca.crt";
@@ -152,7 +148,6 @@ namespace amnezia
             constexpr char defaultSubnetCidr[] = "24";
 
             constexpr char defaultPort[] = "51820";
-            constexpr char defaultMtu[] = "1420";
             constexpr char serverConfigPath[] = "/opt/amnezia/wireguard/wg0.conf";
             constexpr char serverPublicKeyPath[] = "/opt/amnezia/wireguard/wireguard_server_public_key.key";
             constexpr char serverPskKeyPath[] = "/opt/amnezia/wireguard/wireguard_psk.key";
@@ -168,7 +163,6 @@ namespace amnezia
         namespace awg
         {
             constexpr char defaultPort[] = "55424";
-            constexpr char defaultMtu[] = "1420";
 
             constexpr char serverConfigPath[] = "/opt/amnezia/awg/wg0.conf";
             constexpr char serverPublicKeyPath[] = "/opt/amnezia/awg/wireguard_server_public_key.key";

client/resources.qrc

@@ -224,9 +224,6 @@
         <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
         <file>images/controls/close.svg</file>
         <file>images/controls/search.svg</file>
-        <file>ui/qml/Pages2/PageProtocolWireGuardSettings.qml</file>
-        <file>ui/qml/Components/HomeSplitTunnelingDrawer.qml</file>
-        <file>images/controls/split-tunneling.svg</file>
         <file>ui/qml/Controls2/DrawerType2.qml</file>
     </qresource>
 </RCC>

client/server_scripts/build_container.sh

@@ -1 +1 @@
-sudo docker build --no-cache --pull -t $CONTAINER_NAME $DOCKERFILE_FOLDER
+sudo docker build --no-cache --pull -t $CONTAINER_NAME $DOCKERFILE_FOLDER --build-arg SERVER_ARCH=$(uname -m)

client/server_scripts/openvpn_cloak/Dockerfile

@@ -1,8 +1,9 @@
 FROM alpine:3.15
 LABEL maintainer="AmneziaVPN"
 
-ARG SS_RELEASE="v1.18.1"
-ARG CLOAK_RELEASE="v2.8.0"
+ARG SS_RELEASE="v1.13.1"
+ARG CLOAK_RELEASE="v2.5.5"
+ARG SERVER_ARCH
 
 #Install required packages
 RUN apk add --no-cache curl openvpn easy-rsa bash netcat-openbsd dumb-init rng-tools
@@ -15,19 +16,20 @@ RUN mkdir -p /opt/amnezia
 RUN echo -e "#!/bin/bash\ntail -f /dev/null" > /opt/amnezia/start.sh
 RUN chmod a+x /opt/amnezia/start.sh
 
-RUN SERVER_ARCH=$(uname -m) && \
-  if [ $SERVER_ARCH="x86_64" ]; then CK_ARCH="amd64"; \
-  elif [ $SERVER_ARCH="i686" ]; then CK_ARCH="386"; \
-  elif [ $SERVER_ARCH="aarch64" ]; then CK_ARCH="arm64"; \
-  elif [ $SERVER_ARCH="arm" ]; then CK_ARCH="arm"; \
-  else exit -1; fi && \
-  curl -L https://github.com/cbeuw/Cloak/releases/download/${CLOAK_RELEASE}/ck-server-linux-${CK_ARCH}-${CLOAK_RELEASE} > /usr/bin/ck-server && \
-  chmod a+x /usr/bin/ck-server && \
-  curl -L https://github.com/shadowsocks/shadowsocks-rust/releases/download/${SS_RELEASE}/shadowsocks-${SS_RELEASE}.${SERVER_ARCH}-unknown-linux-musl.tar.xz  > /usr/bin/ss.tar.xz && \
-  tar -Jxvf /usr/bin/ss.tar.xz -C /usr/bin/ && \
-  chmod a+x /usr/bin/ssserver
+RUN if [ $SERVER_ARCH="x86_64" ]; then CK_ARCH="amd64"; \
+    elif [ $SERVER_ARCH="i686" ]; then CK_ARCH="386"; \
+    elif [ $SERVER_ARCH="aarch64" ]; then CK_ARCH="arm64"; \
+    elif [ $SERVER_ARCH="arm" ]; then CK_ARCH="arm"; \
+    else exit -1; fi && \
+    curl -L https://github.com/cbeuw/Cloak/releases/download/${CLOAK_RELEASE}/ck-server-linux-${CK_ARCH}-${CLOAK_RELEASE} > /usr/bin/ck-server
+RUN chmod a+x /usr/bin/ck-server
 
-# Tune network
+RUN curl -L https://github.com/shadowsocks/shadowsocks-rust/releases/download/${SS_RELEASE}/shadowsocks-${SS_RELEASE}.${SERVER_ARCH}-unknown-linux-musl.tar.xz  > /usr/bin/ss.tar.xz
+
+RUN tar -Jxvf /usr/bin/ss.tar.xz -C /usr/bin/
+RUN chmod a+x /usr/bin/ssserver
+
+# Tune network  
 RUN echo -e " \n\
   fs.file-max = 51200 \n\
   \n\

client/server_scripts/openvpn_shadowsocks/Dockerfile

@@ -1,7 +1,8 @@
 FROM alpine:3.15
 LABEL maintainer="AmneziaVPN"
 
-ARG SS_RELEASE="v1.18.1"
+ARG SS_RELEASE="v1.13.1"
+ARG SERVER_ARCH
 
 #Install required packages
 RUN apk add --no-cache curl openvpn easy-rsa bash netcat-openbsd dumb-init rng-tools xz
@@ -14,16 +15,7 @@ RUN mkdir -p /opt/amnezia
 RUN echo -e "#!/bin/bash\ntail -f /dev/null" > /opt/amnezia/start.sh
 RUN chmod a+x /opt/amnezia/start.sh
 
-RUN SERVER_ARCH=$(uname -m); \
-  SUFFIX=""; \
-  if [ ! -z "$(echo ${SERVER_ARCH} | grep -i arm)" ]; then \
-    if [ ! -z "$(cat /proc/cpuinfo | grep -i vfp)" ]; then \
-      SUFFIX="eabihf"; \
-    else \
-      SUFFIX="eabi"; \
-    fi; \
-  fi; \
-  curl -L https://github.com/shadowsocks/shadowsocks-rust/releases/download/${SS_RELEASE}/shadowsocks-${SS_RELEASE}.${SERVER_ARCH}-unknown-linux-musl${SUFFIX}.tar.xz > /usr/bin/ss.tar.xz;\
+RUN curl -L https://github.com/shadowsocks/shadowsocks-rust/releases/download/${SS_RELEASE}/shadowsocks-${SS_RELEASE}.${SERVER_ARCH}-unknown-linux-musl.tar.xz  > /usr/bin/ss.tar.xz;\
   tar -Jxvf /usr/bin/ss.tar.xz -C /usr/bin/;\
   chmod a+x /usr/bin/ssserver;
 

client/server_scripts/remove_all_containers.sh

@@ -1,5 +1,4 @@
-sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop;\
-sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv;\
-sudo docker images -a | grep amnezia | awk '{print $3}' | xargs sudo docker rmi;\
-sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm;\
-sudo rm -frd /opt/amnezia
+sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker stop
+sudo docker ps -a | grep amnezia | awk '{print $1}' | xargs sudo docker rm -fv
+sudo docker images -a | grep amnezia | awk '{print $3}' | xargs sudo docker rmi
+sudo docker network ls | grep amnezia-dns-net | awk '{print $1}' | xargs sudo docker network rm

client/server_scripts/remove_container.sh

@@ -1,3 +1,3 @@
-sudo docker stop $CONTAINER_NAME;\
-sudo docker rm -fv $CONTAINER_NAME;\
+sudo docker stop $CONTAINER_NAME
+sudo docker rm -fv $CONTAINER_NAME
 sudo docker rmi $CONTAINER_NAME

client/settings.cpp

@@ -68,7 +68,6 @@ void Settings::removeServer(int index)
 
     servers.removeAt(index);
     setServersArray(servers);
-    emit serverRemoved(index);
 }
 
 bool Settings::editServer(int index, const QJsonObject &server)
@@ -226,22 +225,9 @@ void Settings::setSaveLogs(bool enabled)
         }
     }
 #endif
-    if (enabled) {
-        setLogEnableDate(QDateTime::currentDateTime());
-    }
     emit saveLogsChanged(enabled);
 }
 
-QDateTime Settings::getLogEnableDate()
-{
-    return value("Conf/logEnableDate").toDateTime();
-}
-
-void Settings::setLogEnableDate(QDateTime date)
-{
-    setValue("Conf/logEnableDate", date);
-}
-
 QString Settings::routeModeString(RouteMode mode) const
 {
     switch (mode) {
@@ -352,7 +338,6 @@ QString Settings::secondaryDns() const
 void Settings::clearSettings()
 {
     m_settings.clearSettings();
-    emit settingsCleared();
 }
 
 ServerCredentials Settings::defaultServerCredentials() const

client/settings.h

@@ -100,9 +100,6 @@ public:
     }
     void setSaveLogs(bool enabled);
 
-    QDateTime getLogEnableDate();
-    void setLogEnableDate(QDateTime date);
-
     enum RouteMode {
         VpnAllSites,
         VpnOnlyForwardSites,
@@ -188,16 +185,12 @@ public:
     void setScreenshotsEnabled(bool enabled)
     {
         setValue("Conf/screenshotsEnabled", enabled);
-        emit screenshotsEnabledChanged(enabled);
     }
 
     void clearSettings();
 
 signals:
     void saveLogsChanged(bool enabled);
-    void screenshotsEnabledChanged(bool enabled);
-    void serverRemoved(int serverIndex);
-    void settingsCleared();
 
 private:
     QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const;

client/ui/controllers/apiController.cpp

@@ -90,7 +90,7 @@ void ApiController::updateServerConfigFromApi()
             request.setRawHeader("Authorization",
                                  "Api-Key " + serverConfig.value(configKey::accessToken).toString().toUtf8());
             QString endpoint = serverConfig.value(configKey::apiEdnpoint).toString();
-            request.setUrl(endpoint);
+            request.setUrl(endpoint.replace("https", "http")); // todo remove
 
             QString protocol = serverConfig.value(configKey::protocol).toString();
 
@@ -136,12 +136,10 @@ void ApiController::updateServerConfigFromApi()
 
                 auto defaultContainer = apiConfig.value(config_key::defaultContainer).toString();
                 serverConfig.insert(config_key::defaultContainer, defaultContainer);
-                m_serversModel->editServer(serverConfig, m_serversModel->getDefaultServerIndex());
+                m_serversModel->editServer(serverConfig);
+                emit m_serversModel->defaultContainerChanged(ContainerProps::containerFromString(defaultContainer));
             } else {
-                QString err = reply->errorString();
-                qDebug() << QString::fromUtf8(reply->readAll());
                 qDebug() << reply->error();
-                qDebug() << err;
                 qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
                 emit errorOccurred(errorString(ApiConfigDownloadError));
                 m_isConfigUpdateStarted = false;
@@ -166,5 +164,5 @@ void ApiController::clearApiConfig()
 
     serverConfig.insert(config_key::defaultContainer, ContainerProps::containerToString(DockerContainer::None));
 
-    m_serversModel->editServer(serverConfig, m_serversModel->getDefaultServerIndex());
+    m_serversModel->editServer(serverConfig);
 }

client/ui/controllers/connectionController.cpp

@@ -25,16 +25,15 @@ ConnectionController::ConnectionController(const QSharedPointer<ServersModel> &s
 
 void ConnectionController::openConnection()
 {
-    int serverIndex = m_serversModel->getDefaultServerIndex();
-
-    if (!m_serversModel->data(serverIndex, ServersModel::Roles::HasInstalledContainers).toBool()) {
+    if (!m_containersModel->isAnyContainerInstalled()) {
         emit noInstalledContainers();
         return;
     }
 
+    int serverIndex = m_serversModel->getDefaultServerIndex();
     ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);
 
-    DockerContainer container = qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
+    DockerContainer container = m_serversModel->getDefaultContainer(serverIndex);
     const QJsonObject &containerConfig = m_containersModel->getContainerConfig(container);
 
     if (container == DockerContainer::None) {
@@ -62,7 +61,7 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
     m_state = state;
 
     m_isConnected = false;
-    m_connectionStateText = tr("Connecting...");
+    m_connectionStateText = tr("Connection...");
     switch (state) {
     case Vpn::ConnectionState::Connected: {
         m_isConnectionInProgress = false;
@@ -76,7 +75,7 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
     }
     case Vpn::ConnectionState::Reconnecting: {
         m_isConnectionInProgress = true;
-        m_connectionStateText = tr("Reconnecting...");
+        m_connectionStateText = tr("Reconnection...");
         break;
     }
     case Vpn::ConnectionState::Disconnected: {
@@ -86,7 +85,7 @@ void ConnectionController::onConnectionStateChanged(Vpn::ConnectionState state)
     }
     case Vpn::ConnectionState::Disconnecting: {
         m_isConnectionInProgress = true;
-        m_connectionStateText = tr("Disconnecting...");
+        m_connectionStateText = tr("Disconnection...");
         break;
     }
     case Vpn::ConnectionState::Preparing: {

client/ui/controllers/exportController.cpp

@@ -8,7 +8,6 @@
 #include <QImage>
 #include <QStandardPaths>
 
-#include "configurators/awg_configurator.h"
 #include "configurators/cloak_configurator.h"
 #include "configurators/openvpn_configurator.h"
 #include "configurators/shadowsocks_configurator.h"
@@ -46,7 +45,7 @@ void ExportController::generateFullAccessConfig()
 {
     clearPreviousConfig();
 
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     QJsonObject config = m_settings->server(serverIndex);
 
     QJsonArray containers = config.value(config_key::containers).toArray();
@@ -100,7 +99,7 @@ void ExportController::generateConnectionConfig(const QString &clientName)
 {
     clearPreviousConfig();
 
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);
 
     DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -156,7 +155,7 @@ void ExportController::generateOpenVpnConfig(const QString &clientName)
 {
     clearPreviousConfig();
 
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);
 
     DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -194,7 +193,7 @@ void ExportController::generateWireGuardConfig(const QString &clientName)
 {
     clearPreviousConfig();
 
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);
 
     DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -229,50 +228,11 @@ void ExportController::generateWireGuardConfig(const QString &clientName)
     emit exportConfigChanged();
 }
 
-void ExportController::generateAwgConfig(const QString &clientName)
-{
-    clearPreviousConfig();
-
-    int serverIndex = m_serversModel->getProcessedServerIndex();
-    ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);
-
-    DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
-    QJsonObject containerConfig = m_containersModel->getContainerConfig(container);
-    containerConfig.insert(config_key::container, ContainerProps::containerToString(container));
-
-    QString clientId;
-    ErrorCode errorCode = ErrorCode::NoError;
-    QString config = m_configurator->awgConfigurator->genAwgConfig(credentials, container, containerConfig,
-                                                                               clientId, &errorCode);
-    if (errorCode) {
-        emit exportErrorOccurred(errorString(errorCode));
-        return;
-    }
-    config = m_configurator->processConfigWithExportSettings(serverIndex, container, Proto::Awg, config);
-
-    auto configJson = QJsonDocument::fromJson(config.toUtf8()).object();
-    QStringList lines = configJson.value(config_key::config).toString().replace("\r", "").split("\n");
-    for (const QString &line : lines) {
-        m_config.append(line + "\n");
-    }
-
-    qrcodegen::QrCode qr = qrcodegen::QrCode::encodeText(m_config.toUtf8(), qrcodegen::QrCode::Ecc::LOW);
-    m_qrCodes << svgToBase64(QString::fromStdString(toSvgString(qr, 1)));
-
-    errorCode = m_clientManagementModel->appendClient(clientId, clientName, container, credentials);
-    if (errorCode) {
-        emit exportErrorOccurred(errorString(errorCode));
-        return;
-    }
-
-    emit exportConfigChanged();
-}
-
 void ExportController::generateShadowSocksConfig()
 {
     clearPreviousConfig();
 
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);
 
     DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -308,7 +268,7 @@ void ExportController::generateCloakConfig()
 {
     clearPreviousConfig();
 
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials credentials = m_serversModel->getServerCredentials(serverIndex);
 
     DockerContainer container = static_cast<DockerContainer>(m_containersModel->getCurrentlyProcessedContainerIndex());
@@ -368,7 +328,7 @@ void ExportController::updateClientManagementModel(const DockerContainer contain
 void ExportController::revokeConfig(const int row, const DockerContainer container, ServerCredentials credentials)
 {
     ErrorCode errorCode = m_clientManagementModel->revokeClient(row, container, credentials,
-                                                                m_serversModel->getProcessedServerIndex());
+                                                                m_serversModel->getCurrentlyProcessedServerIndex());
     if (errorCode != ErrorCode::NoError) {
         emit exportErrorOccurred(errorString(errorCode));
     }
@@ -418,6 +378,4 @@ void ExportController::clearPreviousConfig()
     m_config.clear();
     m_nativeConfigString.clear();
     m_qrCodes.clear();
-
-    emit exportConfigChanged();
 }

client/ui/controllers/exportController.h

@@ -34,7 +34,6 @@ public slots:
     void generateConnectionConfig(const QString &clientName);
     void generateOpenVpnConfig(const QString &clientName);
     void generateWireGuardConfig(const QString &clientName);
-    void generateAwgConfig(const QString &clientName);
     void generateShadowSocksConfig();
     void generateCloakConfig();
 

client/ui/controllers/importController.cpp

@@ -18,9 +18,7 @@ namespace
     enum class ConfigTypes {
         Amnezia,
         OpenVpn,
-        WireGuard,
-        Backup,
-        Invalid
+        WireGuard
     };
 
     ConfigTypes checkConfigFormat(const QString &config)
@@ -34,23 +32,15 @@ namespace
         const QString wireguardConfigPatternSectionInterface = "[Interface]";
         const QString wireguardConfigPatternSectionPeer = "[Peer]";
 
-        const QString amneziaConfigPattern = "containers";
-        const QString amneziaFreeConfigPattern = "api_key";
-        const QString backupPattern = "Servers/serversList";
-
-        if (config.contains(backupPattern)) {
-            return ConfigTypes::Backup;
-        } else if (config.contains(amneziaConfigPattern) || config.contains(amneziaFreeConfigPattern)) {
-            return ConfigTypes::Amnezia;
-        } else if (config.contains(openVpnConfigPatternCli)
-                   && (config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2))
-                   && (config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) {
+        if (config.contains(openVpnConfigPatternCli)
+            && (config.contains(openVpnConfigPatternProto1) || config.contains(openVpnConfigPatternProto2))
+            && (config.contains(openVpnConfigPatternDriver1) || config.contains(openVpnConfigPatternDriver2))) {
             return ConfigTypes::OpenVpn;
         } else if (config.contains(wireguardConfigPatternSectionInterface)
                    && config.contains(wireguardConfigPatternSectionPeer)) {
             return ConfigTypes::WireGuard;
         }
-        return ConfigTypes::Invalid;
+        return ConfigTypes::Amnezia;
     }
 
 #if defined Q_OS_ANDROID
@@ -68,65 +58,34 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
 #endif
 }
 
-bool ImportController::extractConfigFromFile(const QString &fileName)
+void ImportController::extractConfigFromFile(const QString &fileName)
 {
     QFile file(fileName);
 
     if (file.open(QIODevice::ReadOnly)) {
         QString data = file.readAll();
 
+        extractConfigFromData(data);
         m_configFileName = QFileInfo(file.fileName()).fileName();
-        return extractConfigFromData(data);
     }
-
-    emit importErrorOccurred(tr("Unable to open file"), false);
-    return false;
 }
 
-bool ImportController::extractConfigFromData(QString data)
+void ImportController::extractConfigFromData(QString data)
 {
-    QString config = data;
-    auto configFormat = checkConfigFormat(config);
-    if (configFormat == ConfigTypes::Invalid) {
-        data.replace("vpn://", "");
-        QByteArray ba =
-                QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
-        QByteArray ba_uncompressed = qUncompress(ba);
-        if (!ba_uncompressed.isEmpty()) {
-            ba = ba_uncompressed;
-        }
+    auto configFormat = checkConfigFormat(data);
+    if (configFormat == ConfigTypes::OpenVpn) {
+        m_config = extractOpenVpnConfig(data);
+    } else if (configFormat == ConfigTypes::WireGuard) {
+        m_config = extractWireGuardConfig(data);
+    } else {
+        m_config = extractAmneziaConfig(data);
+    }
+}
 
-        config = ba;
-        configFormat = checkConfigFormat(config);
-    }
-
-    switch (configFormat) {
-    case ConfigTypes::OpenVpn: {
-        m_config = extractOpenVpnConfig(config);
-        return m_config.empty() ? false : true;
-    }
-    case ConfigTypes::WireGuard: {
-        m_config = extractWireGuardConfig(config);
-        return m_config.empty() ? false : true;
-    }
-    case ConfigTypes::Amnezia: {
-        m_config = QJsonDocument::fromJson(config.toUtf8()).object();
-        return m_config.empty() ? false : true;
-    }
-    case ConfigTypes::Backup: {
-        if (!m_serversModel->getServersCount()) {
-            emit restoreAppConfig(config.toUtf8());
-        } else {
-            emit importErrorOccurred(tr("Invalid configuration file"), false);
-        }
-        break;
-    }
-    case ConfigTypes::Invalid: {
-        emit importErrorOccurred(tr("Invalid configuration file"), false);
-        break;
-    }
-    }
-    return false;
+void ImportController::extractConfigFromCode(QString code)
+{
+    m_config = extractAmneziaConfig(code);
+    m_configFileName = "";
 }
 
 bool ImportController::extractConfigFromQr(const QByteArray &data)
@@ -180,13 +139,28 @@ void ImportController::importConfig()
     } else {
         qDebug() << "Failed to import profile";
         qDebug().noquote() << QJsonDocument(m_config).toJson();
-        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError), false);
+        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError));
     }
 
     m_config = {};
     m_configFileName.clear();
 }
 
+QJsonObject ImportController::extractAmneziaConfig(QString &data)
+{
+    data.replace("vpn://", "");
+    QByteArray ba = QByteArray::fromBase64(data.toUtf8(), QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals);
+
+    QByteArray ba_uncompressed = qUncompress(ba);
+    if (!ba_uncompressed.isEmpty()) {
+        ba = ba_uncompressed;
+    }
+
+    QJsonObject config = QJsonDocument::fromJson(ba).object();
+
+    return config;
+}
+
 QJsonObject ImportController::extractOpenVpnConfig(const QString &data)
 {
     QJsonObject openVpnConfig;
@@ -255,9 +229,8 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
     if (hostNameAndPortMatch.hasCaptured(1)) {
         hostName = hostNameAndPortMatch.captured(1);
     } else {
-        qDebug() << "Key parameter 'Endpoint' is missing";
-        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError), false);
-        return QJsonObject();
+        qDebug() << "Failed to import profile";
+        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError));
     }
 
     if (hostNameAndPortMatch.hasCaptured(2)) {
@@ -269,11 +242,10 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
     lastConfig[config_key::hostName] = hostName;
     lastConfig[config_key::port] = port.toInt();
 
-    if (!configMap.value("PrivateKey").isEmpty() && !configMap.value("Address").isEmpty()
-        && !configMap.value("PublicKey").isEmpty()) {
+//    if (!configMap.value("PrivateKey").isEmpty() && !configMap.value("Address").isEmpty()
+//        && !configMap.value("PresharedKey").isEmpty() && !configMap.value("PublicKey").isEmpty()) {
         lastConfig[config_key::client_priv_key] = configMap.value("PrivateKey");
         lastConfig[config_key::client_ip] = configMap.value("Address");
-
         if (!configMap.value("PresharedKey").isEmpty()) {
             lastConfig[config_key::psk_key] = configMap.value("PresharedKey");
         } else if (!configMap.value("PreSharedKey").isEmpty()) {
@@ -281,15 +253,11 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
         }
 
         lastConfig[config_key::server_pub_key] = configMap.value("PublicKey");
-    } else {
-        qDebug() << "One of the key parameters is missing (PrivateKey, Address, PublicKey)";
-        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError), false);
-        return QJsonObject();
-    }
-
-    if (!configMap.value("MTU").isEmpty()) {
-        lastConfig[config_key::mtu] = configMap.value("MTU");
-    }
+//    } else {
+//        qDebug() << "Failed to import profile";
+//        emit importErrorOccurred(errorString(ErrorCode::ImportInvalidConfigError));
+//        return QJsonObject();
+//    }
 
     QJsonArray allowedIpsJsonArray = QJsonArray::fromStringList(configMap.value("AllowedIPs").split(","));
 

client/ui/controllers/importController.h

@@ -18,8 +18,9 @@ public:
 
 public slots:
     void importConfig();
-    bool extractConfigFromFile(const QString &fileName);
-    bool extractConfigFromData(QString data);
+    void extractConfigFromFile(const QString &fileName);
+    void extractConfigFromData(QString data);
+    void extractConfigFromCode(QString code);
     bool extractConfigFromQr(const QByteArray &data);
     QString getConfig();
     QString getConfigFileName();
@@ -38,13 +39,12 @@ public slots:
 
 signals:
     void importFinished();
-    void importErrorOccurred(const QString &errorMessage, bool goToPageHome);
+    void importErrorOccurred(const QString &errorMessage, bool goToPageHome = false);
 
     void qrDecodingFinished();
 
-    void restoreAppConfig(const QByteArray &data);
-
 private:
+    QJsonObject extractAmneziaConfig(QString &data);
     QJsonObject extractOpenVpnConfig(const QString &data);
     QJsonObject extractWireGuardConfig(const QString &data);
 

client/ui/controllers/installController.cpp

@@ -10,8 +10,6 @@
 #include "core/errorstrings.h"
 #include "core/controllers/serverController.h"
 #include "utilities.h"
-#include "ui/models/protocols/awgConfigModel.h"
-#include "ui/models/protocols/wireguardConfigModel.h"
 
 namespace
 {
@@ -178,7 +176,7 @@ void InstallController::installServer(DockerContainer container, QJsonObject &co
 
 void InstallController::installContainer(DockerContainer container, QJsonObject &config)
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials serverCredentials =
             qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
@@ -240,7 +238,7 @@ bool InstallController::isServerAlreadyExists()
 
 void InstallController::scanServerForInstalledContainers()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials serverCredentials =
             qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
@@ -269,28 +267,24 @@ void InstallController::scanServerForInstalledContainers()
 
 void InstallController::updateContainer(QJsonObject config)
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials serverCredentials =
             qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
 
     const DockerContainer container = ContainerProps::containerFromString(config.value(config_key::container).toString());
     QJsonObject oldContainerConfig = m_containersModel->getContainerConfig(container);
-    ErrorCode errorCode = ErrorCode::NoError;
 
-    if (isUpdateDockerContainerRequired(container, oldContainerConfig, config)) {
-        ServerController serverController(m_settings);
-        connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
-        connect(this, &InstallController::cancelInstallation, &serverController, &ServerController::cancelInstallation);
-
-        errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
-    }
+    ServerController serverController(m_settings);
+    connect(&serverController, &ServerController::serverIsBusy, this, &InstallController::serverIsBusy);
+    connect(this, &InstallController::cancelInstallation, &serverController, &ServerController::cancelInstallation);
 
+    auto errorCode = serverController.updateContainer(serverCredentials, container, oldContainerConfig, config);
     if (errorCode == ErrorCode::NoError) {
         m_serversModel->updateContainerConfig(container, config);
         m_protocolModel->updateModel(config);
 
-        auto defaultContainer = qvariant_cast<DockerContainer>(m_serversModel->data(serverIndex, ServersModel::Roles::DefaultContainerRole));
-        if ((serverIndex == m_serversModel->getDefaultServerIndex()) && (container == defaultContainer)) {
+        if ((serverIndex == m_serversModel->getDefaultServerIndex())
+            && (container == m_serversModel->getDefaultContainer(serverIndex))) {
             emit currentContainerUpdated();
         } else {
             emit updateContainerFinished(tr("Settings updated successfully"));
@@ -302,27 +296,27 @@ void InstallController::updateContainer(QJsonObject config)
     emit installationErrorOccurred(errorString(errorCode));
 }
 
-void InstallController::rebootProcessedServer()
+void InstallController::rebootCurrentlyProcessedServer()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
 
     m_serversModel->rebootServer();
-    emit rebootProcessedServerFinished(tr("Server '%1' was rebooted").arg(serverName));
+    emit rebootCurrentlyProcessedServerFinished(tr("Server '%1' was rebooted").arg(serverName));
 }
 
-void InstallController::removeProcessedServer()
+void InstallController::removeCurrentlyProcessedServer()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
 
     m_serversModel->removeServer();
-    emit removeProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
+    emit removeCurrentlyProcessedServerFinished(tr("Server '%1' was removed").arg(serverName));
 }
 
 void InstallController::removeAllContainers()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
 
     ErrorCode errorCode = m_serversModel->removeAllContainers();
@@ -335,7 +329,7 @@ void InstallController::removeAllContainers()
 
 void InstallController::removeCurrentlyProcessedContainer()
 {
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     QString serverName = m_serversModel->data(serverIndex, ServersModel::Roles::NameRole).toString();
 
     int container = m_containersModel->getCurrentlyProcessedContainerIndex();
@@ -383,7 +377,7 @@ void InstallController::mountSftpDrive(const QString &port, const QString &passw
     QString mountPath;
     QString cmd;
 
-    int serverIndex = m_serversModel->getProcessedServerIndex();
+    int serverIndex = m_serversModel->getCurrentlyProcessedServerIndex();
     ServerCredentials serverCredentials =
             qvariant_cast<ServerCredentials>(m_serversModel->data(serverIndex, ServersModel::Roles::CredentialsRole));
     QString hostname = serverCredentials.hostName;
@@ -520,29 +514,3 @@ void InstallController::addEmptyServer()
 
     emit installServerFinished(tr("Server added successfully"));
 }
-
-bool InstallController::isUpdateDockerContainerRequired(const DockerContainer container, const QJsonObject &oldConfig, const QJsonObject &newConfig)
-{
-    Proto mainProto = ContainerProps::defaultProtocol(container);
-
-    const QJsonObject &oldProtoConfig = oldConfig.value(ProtocolProps::protoToString(mainProto)).toObject();
-    const QJsonObject &newProtoConfig = newConfig.value(ProtocolProps::protoToString(mainProto)).toObject();
-
-    if (container == DockerContainer::Awg) {
-        const AwgConfig oldConfig(oldProtoConfig);
-        const AwgConfig newConfig(newProtoConfig);
-
-        if (!oldConfig.hasEqualServerSettings(newConfig)) {
-            return true;
-        }
-    } else if (container == DockerContainer::WireGuard) {
-        const WgConfig oldConfig(oldProtoConfig);
-        const WgConfig newConfig(newProtoConfig);
-
-        if (!oldConfig.hasEqualServerSettings(newConfig)) {
-            return true;
-        }
-    }
-
-    return false;
-}

client/ui/controllers/installController.h

@@ -30,8 +30,8 @@ public slots:
 
     void updateContainer(QJsonObject config);
 
-    void removeProcessedServer();
-    void rebootProcessedServer();
+    void removeCurrentlyProcessedServer();
+    void rebootCurrentlyProcessedServer();
     void removeAllContainers();
     void removeCurrentlyProcessedContainer();
 
@@ -54,8 +54,8 @@ signals:
 
     void scanServerFinished(bool isInstalledContainerFound);
 
-    void rebootProcessedServerFinished(const QString &finishedMessage);
-    void removeProcessedServerFinished(const QString &finishedMessage);
+    void rebootCurrentlyProcessedServerFinished(const QString &finishedMessage);
+    void removeCurrentlyProcessedServerFinished(const QString &finishedMessage);
     void removeAllContainersFinished(const QString &finishedMessage);
     void removeCurrentlyProcessedContainerFinished(const QString &finishedMessage);
 
@@ -76,8 +76,6 @@ private:
     void installContainer(DockerContainer container, QJsonObject &config);
     bool isServerAlreadyExists();
 
-    bool isUpdateDockerContainerRequired(const DockerContainer container, const QJsonObject &oldConfig, const QJsonObject &newConfig);
-
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
     QSharedPointer<ProtocolsModel> m_protocolModel;

client/ui/controllers/pageController.cpp

@@ -77,16 +77,7 @@ void PageController::closeWindow()
 void PageController::keyPressEvent(Qt::Key key)
 {
     switch (key) {
-    case Qt::Key_Back:
-    case Qt::Key_Escape: {
-        if (m_drawerDepth) {
-            emit closeTopDrawer();
-            setDrawerDepth(getDrawerDepth() - 1);
-        } else {
-            emit escapePressed();
-        }
-        break;
-    }
+    case Qt::Key_Back: emit closePage();
     default: return;
     }
 }
@@ -132,7 +123,7 @@ bool PageController::isTriggeredByConnectButton()
     return m_isTriggeredByConnectButton;
 }
 
-void PageController::setTriggeredByConnectButton(bool trigger)
+void PageController::setTriggeredBtConnectButton(bool trigger)
 {
     m_isTriggeredByConnectButton = trigger;
 }
@@ -141,15 +132,3 @@ void PageController::closeApplication()
 {
     qApp->quit();
 }
-
-void PageController::setDrawerDepth(const int depth)
-{
-    if (depth >= 0) {
-        m_drawerDepth = depth;
-    }
-}
-
-int PageController::getDrawerDepth()
-{
-    return m_drawerDepth;
-}

client/ui/controllers/pageController.h

@@ -83,13 +83,10 @@ public slots:
     void showOnStartup();
 
     bool isTriggeredByConnectButton();
-    void setTriggeredByConnectButton(bool trigger);
+    void setTriggeredBtConnectButton(bool trigger);
 
     void closeApplication();
 
-    void setDrawerDepth(const int depth);
-    int getDrawerDepth();
-
 signals:
     void goToPage(PageLoader::PageEnum page, bool slide = true);
     void goToStartPage();
@@ -108,7 +105,7 @@ signals:
     void showNotificationMessage(const QString &message);
 
     void showBusyIndicator(bool visible);
-    void disableControls(bool disabled);
+    void enableTabBar(bool enabled);
 
     void hideMainWindow();
     void raiseMainWindow();
@@ -116,17 +113,12 @@ signals:
     void showPassphraseRequestDrawer();
     void passphraseRequestDrawerClosed(QString passphrase);
 
-    void escapePressed();
-    void closeTopDrawer();
-
 private:
     QSharedPointer<ServersModel> m_serversModel;
 
     std::shared_ptr<Settings> m_settings;
 
     bool m_isTriggeredByConnectButton;
-
-    int m_drawerDepth = 0;
 };
 
 #endif // PAGECONTROLLER_H

client/ui/controllers/settingsController.cpp

@@ -7,7 +7,9 @@
 #include "ui/qautostart.h"
 #include "version.h"
 #ifdef Q_OS_ANDROID
+    #include "platforms/android/android_utils.h"
     #include "platforms/android/android_controller.h"
+    #include <QJniObject>
 #endif
 
 #ifdef Q_OS_IOS
@@ -26,8 +28,21 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
       m_sitesModel(sitesModel),
       m_settings(settings)
 {
-    m_appVersion = QString("%1 (%2, %3)").arg(QString(APP_VERSION), __DATE__, GIT_COMMIT_HASH);
-    checkIfNeedDisableLogs();
+    m_appVersion = QString("%1: %2 (%3)").arg(tr("Software version"), QString(APP_VERSION), __DATE__);
+
+#ifdef Q_OS_ANDROID
+    if (!m_settings->isScreenshotsEnabled()) {
+        // Set security screen for Android app
+        AndroidUtils::runOnAndroidThreadSync([]() {
+            QJniObject activity = AndroidUtils::getActivity();
+            QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+            if (window.isValid()) {
+                const int FLAG_SECURE = 8192;
+                window.callMethod<void>("addFlags", "(I)V", FLAG_SECURE);
+            }
+        });
+    }
+#endif
 }
 
 void SettingsController::toggleAmneziaDns(bool enable)
@@ -72,11 +87,8 @@ void SettingsController::toggleLogging(bool enable)
 {
     m_settings->setSaveLogs(enable);
 #ifdef Q_OS_IOS
-    AmneziaVPN::toggleLogging(enable);
+  AmneziaVPN::toggleLogging(enable);
 #endif
-    if (enable == true) {
-        checkIfNeedDisableLogs();
-    }
     emit loggingStateChanged();
 }
 
@@ -117,11 +129,6 @@ void SettingsController::restoreAppConfig(const QString &fileName)
 
     QByteArray data = file.readAll();
 
-    restoreAppConfigFromData(data);
-}
-
-void SettingsController::restoreAppConfigFromData(const QByteArray &data)
-{
     bool ok = m_settings->restoreAppConfig(data);
     if (ok) {
         m_serversModel->resetModel();
@@ -145,12 +152,7 @@ void SettingsController::clearSettings()
     m_languageModel->changeLanguage(
             static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
     m_sitesModel->setRouteMode(Settings::RouteMode::VpnAllSites);
-
     emit changeSettingsFinished(tr("All settings have been reset to default values"));
-
-#ifdef Q_OS_IOS
-    AmneziaVPN::clearSettings();
-#endif
 }
 
 void SettingsController::clearCachedProfiles()
@@ -197,6 +199,19 @@ bool SettingsController::isScreenshotsEnabled()
 void SettingsController::toggleScreenshotsEnabled(bool enable)
 {
     m_settings->setScreenshotsEnabled(enable);
+#ifdef Q_OS_ANDROID
+    std::string command = enable ? "clearFlags" : "addFlags";
+
+    // Set security screen for Android app
+    AndroidUtils::runOnAndroidThreadSync([&command]() {
+        QJniObject activity = AndroidUtils::getActivity();
+        QJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+        if (window.isValid()) {
+            const int FLAG_SECURE = 8192;
+            window.callMethod<void>(command.c_str(), "(I)V", FLAG_SECURE);
+        }
+    });
+#endif
 }
 
 bool SettingsController::isCameraPresent()
@@ -209,13 +224,3 @@ bool SettingsController::isCameraPresent()
     return false;
 #endif
 }
-
-void SettingsController::checkIfNeedDisableLogs()
-{
-    m_loggingDisableDate = m_settings->getLogEnableDate().addDays(14);
-    if (m_loggingDisableDate <= QDateTime::currentDateTime()) {
-        toggleLogging(false);
-        clearLogs();
-        emit loggingDisableByWatcher();
-    }
-}

client/ui/controllers/settingsController.h

@@ -41,7 +41,6 @@ public slots:
 
     void backupAppConfig(const QString &fileName);
     void restoreAppConfig(const QString &fileName);
-    void restoreAppConfigFromData(const QByteArray &data);
 
     QString getAppVersion();
 
@@ -77,8 +76,6 @@ signals:
 
     void amneziaDnsToggled(bool enable);
 
-    void loggingDisableByWatcher();
-
 private:
     QSharedPointer<ServersModel> m_serversModel;
     QSharedPointer<ContainersModel> m_containersModel;
@@ -87,10 +84,6 @@ private:
     std::shared_ptr<Settings> m_settings;
 
     QString m_appVersion;
-
-    QDateTime m_loggingDisableDate;
-
-    void checkIfNeedDisableLogs();
 };
 
 #endif // SETTINGSCONTROLLER_H

client/ui/controllers/systemController.cpp

@@ -92,11 +92,11 @@ QString SystemController::getFileName(const QString &acceptLabel, const QString
 
     mainFileDialog->setProperty("acceptLabel", QVariant::fromValue(acceptLabel));
     mainFileDialog->setProperty("nameFilters", QVariant::fromValue(QStringList(nameFilter)));
-    mainFileDialog->setProperty("defaultSuffix", QVariant::fromValue(defaultSuffix));
-    mainFileDialog->setProperty("isSaveMode", QVariant::fromValue(isSaveMode));
     if (!selectedFile.isEmpty()) {
-        mainFileDialog->setProperty("selectedFile", QVariant::fromValue(QUrl(selectedFile)));
+        mainFileDialog->setProperty("selectedFile", QVariant::fromValue(selectedFile));
     }
+    mainFileDialog->setProperty("isSaveMode", QVariant::fromValue(isSaveMode));
+    mainFileDialog->setProperty("defaultSuffix", QVariant::fromValue(defaultSuffix));
     QMetaObject::invokeMethod(mainFileDialog, "open");
 
     bool isFileDialogAccepted = false;

client/ui/models/containers_model.cpp

@@ -83,6 +83,20 @@ QJsonObject ContainersModel::getContainerConfig(const int containerIndex)
     return qvariant_cast<QJsonObject>(data(index(containerIndex), ConfigRole));
 }
 
+bool ContainersModel::isAnyContainerInstalled()
+{
+    for (int row=0; row < rowCount(); row++) {
+        QModelIndex idx = this->index(row, 0);
+
+        if (this->data(idx, IsInstalledRole).toBool() &&
+            this->data(idx, ServiceTypeRole).toInt() == ServiceType::Vpn) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 QHash<int, QByteArray> ContainersModel::roleNames() const
 {
     QHash<int, QByteArray> roles;

client/ui/models/containers_model.h

@@ -49,6 +49,8 @@ public slots:
 
     QJsonObject getContainerConfig(const int containerIndex);
 
+    bool isAnyContainerInstalled();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 

client/ui/models/languageModel.cpp

@@ -46,7 +46,6 @@ QString LanguageModel::getLocalLanguageName(const LanguageSettings::AvailableLan
     case LanguageSettings::AvailableLanguageEnum::China_cn: strLanguage = "\347\256\200\344\275\223\344\270\255\346\226\207"; break;
     case LanguageSettings::AvailableLanguageEnum::Persian: strLanguage = "فارسی"; break;
     case LanguageSettings::AvailableLanguageEnum::Arabic: strLanguage = "العربية"; break;
-    case LanguageSettings::AvailableLanguageEnum::Burmese: strLanguage = "မြန်မာဘာသာ"; break;
     default:
         break;
     }
@@ -62,7 +61,6 @@ void LanguageModel::changeLanguage(const LanguageSettings::AvailableLanguageEnum
     case LanguageSettings::AvailableLanguageEnum::China_cn: emit updateTranslations(QLocale::Chinese); break;
     case LanguageSettings::AvailableLanguageEnum::Persian: emit updateTranslations(QLocale::Persian); break;
     case LanguageSettings::AvailableLanguageEnum::Arabic: emit updateTranslations(QLocale::Arabic); break;
-    case LanguageSettings::AvailableLanguageEnum::Burmese: emit updateTranslations(QLocale::Burmese); break;
     default: emit updateTranslations(QLocale::English); break;
     }
 }
@@ -76,20 +74,10 @@ int LanguageModel::getCurrentLanguageIndex()
     case QLocale::Chinese: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::China_cn); break;
     case QLocale::Persian: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Persian); break;
     case QLocale::Arabic: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Arabic); break;
-    case QLocale::Burmese: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::Burmese); break;
     default: return static_cast<int>(LanguageSettings::AvailableLanguageEnum::English); break;
     }
 }
 
-int LanguageModel::getLineHeightAppend()
-{
-    int langIndex = getCurrentLanguageIndex();
-    switch (langIndex) {
-    case 5: return 10; break; // Burmese
-    default: return 0; break;
-    }
-}
-
 QString LanguageModel::getCurrentLanguageName()
 {
     return m_availableLanguages[getCurrentLanguageIndex()].name;

client/ui/models/languageModel.h

@@ -14,8 +14,7 @@ namespace LanguageSettings
         Russian,
         China_cn,
         Persian,
-        Arabic,
-        Burmese
+        Arabic
     };
     Q_ENUM_NS(AvailableLanguageEnum)
 
@@ -49,12 +48,10 @@ public:
 
     Q_PROPERTY(QString currentLanguageName READ getCurrentLanguageName NOTIFY translationsUpdated)
     Q_PROPERTY(int currentLanguageIndex READ getCurrentLanguageIndex NOTIFY translationsUpdated)
-    Q_PROPERTY(int lineHeightAppend READ getLineHeightAppend NOTIFY translationsUpdated)
 
 public slots:
     void changeLanguage(const LanguageSettings::AvailableLanguageEnum language);
     int getCurrentLanguageIndex();
-    int getLineHeightAppend();
     QString getCurrentLanguageName();
 
 signals:

client/ui/models/protocols/awgConfigModel.cpp

@@ -22,7 +22,6 @@ bool AwgConfigModel::setData(const QModelIndex &index, const QVariant &value, in
 
     switch (role) {
     case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
-    case Roles::MtuRole: m_protocolConfig.insert(config_key::mtu, value.toString()); break;
     case Roles::JunkPacketCountRole: m_protocolConfig.insert(config_key::junkPacketCount, value.toString()); break;
     case Roles::JunkPacketMinSizeRole: m_protocolConfig.insert(config_key::junkPacketMinSize, value.toString()); break;
     case Roles::JunkPacketMaxSizeRole: m_protocolConfig.insert(config_key::junkPacketMaxSize, value.toString()); break;
@@ -58,7 +57,6 @@ QVariant AwgConfigModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString();
-    case Roles::MtuRole: return m_protocolConfig.value(config_key::mtu).toString();
     case Roles::JunkPacketCountRole: return m_protocolConfig.value(config_key::junkPacketCount);
     case Roles::JunkPacketMinSizeRole: return m_protocolConfig.value(config_key::junkPacketMinSize);
     case Roles::JunkPacketMaxSizeRole: return m_protocolConfig.value(config_key::junkPacketMaxSize);
@@ -82,21 +80,25 @@ void AwgConfigModel::updateModel(const QJsonObject &config)
 
     QJsonObject protocolConfig = config.value(config_key::awg).toObject();
 
-    m_protocolConfig[config_key::last_config] = protocolConfig.value(config_key::last_config);
-    m_protocolConfig[config_key::port] = protocolConfig.value(config_key::port).toString(protocols::awg::defaultPort);
-    m_protocolConfig[config_key::mtu] = protocolConfig.value(config_key::mtu).toString(protocols::awg::defaultMtu);
+    m_protocolConfig[config_key::port] =
+            protocolConfig.value(config_key::port).toString(protocols::awg::defaultPort);
     m_protocolConfig[config_key::junkPacketCount] =
             protocolConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount);
     m_protocolConfig[config_key::junkPacketMinSize] =
-            protocolConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize);
+            protocolConfig.value(config_key::junkPacketMinSize)
+                    .toString(protocols::awg::defaultJunkPacketMinSize);
     m_protocolConfig[config_key::junkPacketMaxSize] =
-            protocolConfig.value(config_key::junkPacketMaxSize).toString(protocols::awg::defaultJunkPacketMaxSize);
+            protocolConfig.value(config_key::junkPacketMaxSize)
+                    .toString(protocols::awg::defaultJunkPacketMaxSize);
     m_protocolConfig[config_key::initPacketJunkSize] =
-            protocolConfig.value(config_key::initPacketJunkSize).toString(protocols::awg::defaultInitPacketJunkSize);
+            protocolConfig.value(config_key::initPacketJunkSize)
+                    .toString(protocols::awg::defaultInitPacketJunkSize);
     m_protocolConfig[config_key::responsePacketJunkSize] =
-            protocolConfig.value(config_key::responsePacketJunkSize).toString(protocols::awg::defaultResponsePacketJunkSize);
+            protocolConfig.value(config_key::responsePacketJunkSize)
+                    .toString(protocols::awg::defaultResponsePacketJunkSize);
     m_protocolConfig[config_key::initPacketMagicHeader] =
-            protocolConfig.value(config_key::initPacketMagicHeader).toString(protocols::awg::defaultInitPacketMagicHeader);
+            protocolConfig.value(config_key::initPacketMagicHeader)
+                    .toString(protocols::awg::defaultInitPacketMagicHeader);
     m_protocolConfig[config_key::responsePacketMagicHeader] =
             protocolConfig.value(config_key::responsePacketMagicHeader)
                     .toString(protocols::awg::defaultResponsePacketMagicHeader);
@@ -112,19 +114,6 @@ void AwgConfigModel::updateModel(const QJsonObject &config)
 
 QJsonObject AwgConfigModel::getConfig()
 {
-    const AwgConfig oldConfig(m_fullConfig.value(config_key::awg).toObject());
-    const AwgConfig newConfig(m_protocolConfig);
-
-    if (!oldConfig.hasEqualServerSettings(newConfig)) {
-        m_protocolConfig.remove(config_key::last_config);
-    } else {
-        auto lastConfig = m_protocolConfig.value(config_key::last_config).toString();
-        QJsonObject jsonConfig = QJsonDocument::fromJson(lastConfig.toUtf8()).object();
-        jsonConfig[config_key::mtu] = newConfig.mtu;
-
-        m_protocolConfig[config_key::last_config] = QString(QJsonDocument(jsonConfig).toJson());
-    }
-
     m_fullConfig.insert(config_key::awg, m_protocolConfig);
     return m_fullConfig;
 }
@@ -134,7 +123,6 @@ QHash<int, QByteArray> AwgConfigModel::roleNames() const
     QHash<int, QByteArray> roles;
 
     roles[PortRole] = "port";
-    roles[MtuRole] = "mtu";
     roles[JunkPacketCountRole] = "junkPacketCount";
     roles[JunkPacketMinSizeRole] = "junkPacketMinSize";
     roles[JunkPacketMaxSizeRole] = "junkPacketMaxSize";
@@ -147,47 +135,3 @@ QHash<int, QByteArray> AwgConfigModel::roleNames() const
 
     return roles;
 }
-
-AwgConfig::AwgConfig(const QJsonObject &jsonConfig)
-{
-    port = jsonConfig.value(config_key::port).toString(protocols::awg::defaultPort);
-    mtu = jsonConfig.value(config_key::mtu).toString(protocols::awg::defaultMtu);
-    junkPacketCount = jsonConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount);
-    junkPacketMinSize =
-            jsonConfig.value(config_key::junkPacketMinSize).toString(protocols::awg::defaultJunkPacketMinSize);
-    junkPacketMaxSize =
-            jsonConfig.value(config_key::junkPacketMaxSize).toString(protocols::awg::defaultJunkPacketMaxSize);
-    initPacketJunkSize =
-            jsonConfig.value(config_key::initPacketJunkSize).toString(protocols::awg::defaultInitPacketJunkSize);
-    responsePacketJunkSize =
-            jsonConfig.value(config_key::responsePacketJunkSize).toString(protocols::awg::defaultResponsePacketJunkSize);
-    initPacketMagicHeader =
-            jsonConfig.value(config_key::initPacketMagicHeader).toString(protocols::awg::defaultInitPacketMagicHeader);
-    responsePacketMagicHeader = jsonConfig.value(config_key::responsePacketMagicHeader)
-                                        .toString(protocols::awg::defaultResponsePacketMagicHeader);
-    underloadPacketMagicHeader = jsonConfig.value(config_key::underloadPacketMagicHeader)
-                                         .toString(protocols::awg::defaultUnderloadPacketMagicHeader);
-    transportPacketMagicHeader = jsonConfig.value(config_key::transportPacketMagicHeader)
-                                         .toString(protocols::awg::defaultTransportPacketMagicHeader);
-}
-
-bool AwgConfig::hasEqualServerSettings(const AwgConfig &other) const
-{
-    if (port != other.port || junkPacketCount != other.junkPacketCount || junkPacketMinSize != other.junkPacketMinSize
-        || junkPacketMaxSize != other.junkPacketMaxSize || initPacketJunkSize != other.initPacketJunkSize
-        || responsePacketJunkSize != other.responsePacketJunkSize || initPacketMagicHeader != other.initPacketMagicHeader
-        || responsePacketMagicHeader != other.responsePacketMagicHeader
-        || underloadPacketMagicHeader != other.underloadPacketMagicHeader
-        || transportPacketMagicHeader != other.transportPacketMagicHeader) {
-        return false;
-    }
-    return true;
-}
-
-bool AwgConfig::hasEqualClientSettings(const AwgConfig &other) const
-{
-    if (mtu != other.mtu) {
-        return false;
-    }
-    return true;
-}

client/ui/models/protocols/awgConfigModel.h

@@ -6,27 +6,6 @@
 
 #include "containers/containers_defs.h"
 
-struct AwgConfig
-{
-    AwgConfig(const QJsonObject &jsonConfig);
-
-    QString port;
-    QString mtu;
-    QString junkPacketCount;
-    QString junkPacketMinSize;
-    QString junkPacketMaxSize;
-    QString initPacketJunkSize;
-    QString responsePacketJunkSize;
-    QString initPacketMagicHeader;
-    QString responsePacketMagicHeader;
-    QString underloadPacketMagicHeader;
-    QString transportPacketMagicHeader;
-
-    bool hasEqualServerSettings(const AwgConfig &other) const;
-    bool hasEqualClientSettings(const AwgConfig &other) const;
-
-};
-
 class AwgConfigModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -34,7 +13,6 @@ class AwgConfigModel : public QAbstractListModel
 public:
     enum Roles {
         PortRole = Qt::UserRole + 1,
-        MtuRole,
         JunkPacketCountRole,
         JunkPacketMinSizeRole,
         JunkPacketMaxSizeRole,