AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iOS AWG protocol Setup

Browse source
This commit is contained in:
Mykola Baibuz 2023-09-30 00:58:08 +03:00
parent 19bd94ed02
commit b7fbb84a58
4 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/3rd-prebuilt

@ -1 +1 @@
Subproject commit e8795854a5cf27004fe78caecc90a961688d1d41 Subproject commit 6f0d654a2409e2f634e7f7b95d34998c8eba2d7b

1
client/containers/containers_defs.cpp
View file

@ -186,6 +186,7 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
switch (c) { switch (c) {
case DockerContainer::WireGuard: return true; case DockerContainer::WireGuard: return true;
case DockerContainer::OpenVpn: return true; case DockerContainer::OpenVpn: return true;
case DockerContainer::AmneziaWireGuard: return true;
case DockerContainer::Cloak: case DockerContainer::Cloak:
return true; return true;
// case DockerContainer::ShadowSocks: return true; // case DockerContainer::ShadowSocks: return true;

1
client/platforms/ios/ios_controller.h
View file

@ -62,6 +62,7 @@ private:
bool setupOpenVPN(); bool setupOpenVPN();
bool setupCloak(); bool setupCloak();
bool setupWireGuard(); bool setupWireGuard();
bool setupAmneziaWireGuard();
bool startOpenVPN(const QString &config); bool startOpenVPN(const QString &config);
bool startWireGuard(const QString &jsonConfig); bool startWireGuard(const QString &jsonConfig);

12
client/platforms/ios/ios_controller.mm
View file

@ -204,6 +204,9 @@ bool IosController::connectVpn(amnezia::Proto proto, const QJsonObject& configur
if (proto == amnezia::Proto::WireGuard) { if (proto == amnezia::Proto::WireGuard) {
return setupWireGuard(); return setupWireGuard();
} }
if (proto == amnezia::Proto::AmneziaWireGuard) {
return setupAmneziaWireGuard();
}
return false; return false;
} }
@ -307,6 +310,15 @@ bool IosController::setupWireGuard()
return startWireGuard(wgConfig); return startWireGuard(wgConfig);
} }
bool IosController::setupAmneziaWireGuard()
{
QJsonObject config = m_rawConfig[ProtocolProps::key_proto_config_data(amnezia::Proto::AmneziaWireGuard)].toObject();
QString wgConfig = config[config_key::config].toString();
return startWireGuard(wgConfig);
}
bool IosController::startOpenVPN(const QString &config) bool IosController::startOpenVPN(const QString &config)
{ {
qDebug() << "IosController::startOpenVPN"; qDebug() << "IosController::startOpenVPN";