From ac154cdd8383879e80b73656759b2f8726418eed Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Fri, 22 Dec 2023 13:06:42 +0700 Subject: [PATCH] returned shadowsocks to cloak container --- client/containers/containers_defs.cpp | 2 +- client/vpnconnection.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/client/containers/containers_defs.cpp b/client/containers/containers_defs.cpp index 8bff8b720..a523ef840 100644 --- a/client/containers/containers_defs.cpp +++ b/client/containers/containers_defs.cpp @@ -54,7 +54,7 @@ QVector ContainerProps::protocolsForContainer(amnezia::DockerCon case DockerContainer::ShadowSocks: return { Proto::OpenVpn, Proto::ShadowSocks }; - case DockerContainer::Cloak: return { Proto::OpenVpn, /*Proto::ShadowSocks,*/ Proto::Cloak }; + case DockerContainer::Cloak: return { Proto::OpenVpn, Proto::ShadowSocks, Proto::Cloak }; case DockerContainer::Ipsec: return { Proto::Ikev2 /*, Protocol::L2tp */ }; diff --git a/client/vpnconnection.cpp b/client/vpnconnection.cpp index 80163ef10..4aec0509c 100644 --- a/client/vpnconnection.cpp +++ b/client/vpnconnection.cpp @@ -259,6 +259,12 @@ QJsonObject VpnConnection::createVpnConfiguration(int serverIndex, const ServerC QJsonObject vpnConfiguration; for (ProtocolEnumNS::Proto proto : ContainerProps::protocolsForContainer(container)) { + auto s = m_settings->server(serverIndex); + if (m_settings->server(serverIndex).value(config_key::configVersion).toInt() && + container == DockerContainer::Cloak && proto == ProtocolEnumNS::Proto::ShadowSocks) { + continue; + } + QJsonObject vpnConfigData = QJsonDocument::fromJson(createVpnConfigurationForProto(serverIndex, credentials, container, containerConfig, proto, errorCode).toUtf8()).object();