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

- Crash fix if service not connected

Browse source 
- import fix
- disabled share button for readonly server
This commit is contained in:
pokamest 2021-05-20 15:59:58 +03:00
parent 7fd13faa59
commit 0ea085cc02
6 changed files with 65 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/configurators/openvpn_configurator.cpp
View file

@ -217,7 +217,7 @@ QString OpenVpnConfigurator::genOpenVpnConfig(const ServerCredentials &credentia
#endif
//qDebug().noquote() << config;
return processConfigWithLocalSettings(config);
return config;
}
QString OpenVpnConfigurator::processConfigWithLocalSettings(QString config)
@ -249,6 +249,22 @@ QString OpenVpnConfigurator::processConfigWithLocalSettings(QString config)
return config;
}
QString OpenVpnConfigurator::processConfigWithExportSettings(QString config)
{
config.replace("$PRIMARY_DNS", m_settings().primaryDns());
config.replace("$SECONDARY_DNS", m_settings().secondaryDns());
if(!config.contains("redirect-gateway def1 bypass-dhcp")) {
config.append("redirect-gateway def1 bypass-dhcp\n");
}
#ifdef Q_OS_MAC
config.replace("block-outside-dns", "");
#endif
return config;
}
QString OpenVpnConfigurator::convertOpenSShKey(const QString &key)
{
QProcess p;

1
client/configurators/openvpn_configurator.h
View file

@ -26,6 +26,7 @@ public:
const QJsonObject &containerConfig, ErrorCode *errorCode = nullptr);
static QString processConfigWithLocalSettings(QString config);
static QString processConfigWithExportSettings(QString config);
static QString convertOpenSShKey(const QString &key);