diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index f0f71f52..3988f9b5 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -263,7 +263,7 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID)) ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.h ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.h ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.h - ${CMAKE_CURRENT_LIST_DIR}/protocols/amneziawireguardprotocol.h + ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.h ) set(SOURCES ${SOURCES} @@ -274,7 +274,7 @@ if(WIN32 OR (APPLE AND NOT IOS) OR (LINUX AND NOT ANDROID)) ${CMAKE_CURRENT_LIST_DIR}/protocols/openvpnovercloakprotocol.cpp ${CMAKE_CURRENT_LIST_DIR}/protocols/shadowsocksvpnprotocol.cpp ${CMAKE_CURRENT_LIST_DIR}/protocols/wireguardprotocol.cpp - ${CMAKE_CURRENT_LIST_DIR}/protocols/amneziawireguardprotocol.cpp + ${CMAKE_CURRENT_LIST_DIR}/protocols/awgprotocol.cpp ) endif() diff --git a/client/protocols/amneziawireguardprotocol.cpp b/client/protocols/awgprotocol.cpp similarity index 77% rename from client/protocols/amneziawireguardprotocol.cpp rename to client/protocols/awgprotocol.cpp index e0e51296..64415dbe 100644 --- a/client/protocols/amneziawireguardprotocol.cpp +++ b/client/protocols/awgprotocol.cpp @@ -1,4 +1,4 @@ -#include "amneziawireguardprotocol.h" +#include "awgprotocol.h" Awg::Awg(const QJsonObject &configuration, QObject *parent) : WireguardProtocol(configuration, parent) diff --git a/client/protocols/amneziawireguardprotocol.h b/client/protocols/awgprotocol.h similarity index 100% rename from client/protocols/amneziawireguardprotocol.h rename to client/protocols/awgprotocol.h diff --git a/client/ui/models/protocols/awgConfigModel.cpp b/client/ui/models/protocols/awgConfigModel.cpp index 7e12be0d..7d0277b9 100644 --- a/client/ui/models/protocols/awgConfigModel.cpp +++ b/client/ui/models/protocols/awgConfigModel.cpp @@ -78,43 +78,43 @@ void AwgConfigModel::updateModel(const QJsonObject &config) m_fullConfig = config; - QJsonObject protocolConfig = config.value(config_key::amneziaWireguard).toObject(); + QJsonObject protocolConfig = config.value(config_key::awg).toObject(); m_protocolConfig[config_key::port] = - protocolConfig.value(config_key::port).toString(protocols::amneziawireguard::defaultPort); + protocolConfig.value(config_key::port).toString(protocols::awg::defaultPort); m_protocolConfig[config_key::junkPacketCount] = - protocolConfig.value(config_key::junkPacketCount).toString(protocols::amneziawireguard::defaultJunkPacketCount); + protocolConfig.value(config_key::junkPacketCount).toString(protocols::awg::defaultJunkPacketCount); m_protocolConfig[config_key::junkPacketMinSize] = protocolConfig.value(config_key::junkPacketMinSize) - .toString(protocols::amneziawireguard::defaultJunkPacketMinSize); + .toString(protocols::awg::defaultJunkPacketMinSize); m_protocolConfig[config_key::junkPacketMaxSize] = protocolConfig.value(config_key::junkPacketMaxSize) - .toString(protocols::amneziawireguard::defaultJunkPacketMaxSize); + .toString(protocols::awg::defaultJunkPacketMaxSize); m_protocolConfig[config_key::initPacketJunkSize] = protocolConfig.value(config_key::initPacketJunkSize) - .toString(protocols::amneziawireguard::defaultInitPacketJunkSize); + .toString(protocols::awg::defaultInitPacketJunkSize); m_protocolConfig[config_key::responsePacketJunkSize] = protocolConfig.value(config_key::responsePacketJunkSize) - .toString(protocols::amneziawireguard::defaultResponsePacketJunkSize); + .toString(protocols::awg::defaultResponsePacketJunkSize); m_protocolConfig[config_key::initPacketMagicHeader] = protocolConfig.value(config_key::initPacketMagicHeader) - .toString(protocols::amneziawireguard::defaultInitPacketMagicHeader); + .toString(protocols::awg::defaultInitPacketMagicHeader); m_protocolConfig[config_key::responsePacketMagicHeader] = protocolConfig.value(config_key::responsePacketMagicHeader) - .toString(protocols::amneziawireguard::defaultResponsePacketMagicHeader); + .toString(protocols::awg::defaultResponsePacketMagicHeader); m_protocolConfig[config_key::underloadPacketMagicHeader] = protocolConfig.value(config_key::underloadPacketMagicHeader) - .toString(protocols::amneziawireguard::defaultUnderloadPacketMagicHeader); + .toString(protocols::awg::defaultUnderloadPacketMagicHeader); m_protocolConfig[config_key::transportPacketMagicHeader] = protocolConfig.value(config_key::transportPacketMagicHeader) - .toString(protocols::amneziawireguard::defaultTransportPacketMagicHeader); + .toString(protocols::awg::defaultTransportPacketMagicHeader); endResetModel(); } QJsonObject AwgConfigModel::getConfig() { - m_fullConfig.insert(config_key::amneziaWireguard, m_protocolConfig); + m_fullConfig.insert(config_key::awg, m_protocolConfig); return m_fullConfig; } diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml index a03b3717..16759da1 100644 --- a/client/ui/qml/Pages2/PageShare.qml +++ b/client/ui/qml/Pages2/PageShare.qml @@ -317,7 +317,7 @@ PageType { if (index === ContainerProps.containerFromString("amnezia-openvpn")) { root.connectionTypesModel.push(openVpnConnectionFormat) - } else if (index === ContainerProps.containerFromString("amnezia-wireguard")) { + } else if (index === ContainerProps.containerFromString("amnezia-awg")) { root.connectionTypesModel.push(wireGuardConnectionFormat) } }