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

Release 1.6 WIP

Browse source
This commit is contained in:
pokamest 2021-04-20 02:09:47 +03:00
parent f9affb083b
commit a5e9cea22f
29 changed files with 2046 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/protocols/openvpnovercloakprotocol.cpp
View file

@ -101,5 +101,5 @@ QString OpenVpnOverCloakProtocol::cloakExecPath()
void OpenVpnOverCloakProtocol::readCloakConfiguration(const QJsonObject &configuration)
{
m_cloakConfig = configuration.value(config::key_cloak_config_data()).toObject();
m_cloakConfig = configuration.value(config::key_cloak_config_data).toObject();
}

8
client/protocols/openvpnprotocol.cpp
View file

@ -68,16 +68,16 @@ void OpenVpnProtocol::killOpenVpnProcess()
void OpenVpnProtocol::readOpenVpnConfiguration(const QJsonObject &configuration)
{
if (configuration.contains(config::key_openvpn_config_data())) {
if (configuration.contains(config::key_openvpn_config_data)) {
m_configFile.open();
m_configFile.write(configuration.value(config::key_openvpn_config_data()).toString().toUtf8());
m_configFile.write(configuration.value(config::key_openvpn_config_data).toString().toUtf8());
m_configFile.close();
m_configFileName = m_configFile.fileName();
qDebug().noquote() << QString("Set config data") << m_configFileName;
}
else if (configuration.contains(config::key_openvpn_config_path())) {
m_configFileName = configuration.value(config::key_openvpn_config_path()).toString();
else if (configuration.contains(config::key_openvpn_config_path)) {
m_configFileName = configuration.value(config::key_openvpn_config_path).toString();
QFileInfo file(m_configFileName);
if (file.fileName().isEmpty()) {

2
client/protocols/shadowsocksvpnprotocol.cpp
View file

@ -110,5 +110,5 @@ QJsonObject ShadowSocksVpnProtocol::genShadowSocksConfig(const ServerCredentials
void ShadowSocksVpnProtocol::readShadowSocksConfiguration(const QJsonObject &configuration)
{
m_shadowSocksConfig = configuration.value(config::key_shadowsocks_config_data()).toObject();
m_shadowSocksConfig = configuration.value(config::key_shadowsocks_config_data).toObject();
}

2
client/protocols/shadowsocksvpnprotocol.h
View file

@ -13,7 +13,7 @@ public:
ErrorCode start() override;
void stop() override;
static QJsonObject genShadowSocksConfig(const ServerCredentials &credentials, Protocol proto = Protocol::ShadowSocks);
static QJsonObject genShadowSocksConfig(const ServerCredentials &credentials, Protocol proto = Protocol::ShadowSocksOverOpenVpn);
protected:
void readShadowSocksConfiguration(const QJsonObject &configuration);