andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-20 02:00:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

(6) fixed xtls-rprx-vision→empty

Browse Source
This commit is contained in:
dranik
2026-06-10 18:20:56 +03:00
parent 4e3d50f3fd
commit d0ca680348
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/core/configurators/xrayConfigurator.cpp
+1 -5
View File
@@ -244,11 +244,7 @@ ErrorCode XrayConfigurator::applyServerSettingsToRemote(const ServerCredentials
<< "container=" << static_cast<int>(container) << "host=" << credentials.hostName << "container=" << static_cast<int>(container) << "host=" << credentials.hostName
<< "transport=" << srv.transport << "security=" << srv.security << "port=" << srv.port << "transport=" << srv.transport << "security=" << srv.security << "port=" << srv.port
<< "appendClient=" << appendNewClient; << "appendClient=" << appendNewClient;
QString flowValue = srv.flow; const QString flowValue = srv.flow;
if (flowValue.isEmpty() && srv.security == QLatin1String("reality")) {
flowValue = QStringLiteral("xtls-rprx-vision");
}
QString realityPublicKey; QString realityPublicKey;
QString realityShortId; QString realityShortId;
if (srv.security == QLatin1String("reality")) { if (srv.security == QLatin1String("reality")) {
client/ui/models/protocols/xrayConfigModel.cpp
+3 -3
View File
@@ -272,7 +272,7 @@ void XrayConfigModel::updateModel(amnezia::DockerContainer container, const amne
} }
if (!m_protocolConfig.serverConfig.isThirdPartyConfig) { if (!m_protocolConfig.serverConfig.isThirdPartyConfig) {
applyDefaultsToServerConfig(m_protocolConfig.serverConfig); applyDefaultsToServerConfig(m_protocolConfig.serverConfig, false);
} }
m_originalProtocolConfig = m_protocolConfig; m_originalProtocolConfig = m_protocolConfig;
@@ -283,7 +283,7 @@ void XrayConfigModel::updateModel(amnezia::DockerContainer container, const amne
} }
} }
void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &config) void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &config, bool fillFlowDefault)
{ {
if (config.port.isEmpty()) { if (config.port.isEmpty()) {
config.port = protocols::xray::defaultPort; config.port = protocols::xray::defaultPort;
@@ -306,7 +306,7 @@ void XrayConfigModel::applyDefaultsToServerConfig(amnezia::XrayServerConfig &con
config.security = protocols::xray::defaultSecurity; config.security = protocols::xray::defaultSecurity;
} }
if (config.flow.isEmpty()) { if (fillFlowDefault && config.flow.isEmpty()) {
config.flow = protocols::xray::defaultFlow; config.flow = protocols::xray::defaultFlow;
} }
client/ui/models/protocols/xrayConfigModel.h
+1 -1
View File
@@ -137,7 +137,7 @@ private:
amnezia::XrayProtocolConfig m_protocolConfig; amnezia::XrayProtocolConfig m_protocolConfig;
amnezia::XrayProtocolConfig m_originalProtocolConfig; amnezia::XrayProtocolConfig m_originalProtocolConfig;
void applyDefaultsToServerConfig(amnezia::XrayServerConfig& config); void applyDefaultsToServerConfig(amnezia::XrayServerConfig& config, bool fillFlowDefault = true);
}; };
#endif // XRAYCONFIGMODEL_H #endif // XRAYCONFIGMODEL_H