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

Fixes for Cloak proto

Browse source
This commit is contained in:
pokamest 2023-05-20 18:44:19 +01:00
parent f0ad76fff6
commit b5b69ff369
3 changed files with 16 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/protocols/openvpnovercloakprotocol.cpp
View file

@ -18,10 +18,7 @@ OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol()
{
qDebug() << "OpenVpnOverCloakProtocol::~OpenVpnOverCloakProtocol";
OpenVpnOverCloakProtocol::stop();
QThread::msleep(200);
#ifndef Q_OS_IOS
m_ckProcess.close();
#endif
}
ErrorCode OpenVpnOverCloakProtocol::start()
@ -30,11 +27,17 @@ ErrorCode OpenVpnOverCloakProtocol::start()
setLastError(ErrorCode::CloakExecutableMissing);
return lastError();
}
#ifndef Q_OS_IOS
if (Utils::processIsRunning(Utils::executable("ck-client", false))) {
Utils::killProcessByName(Utils::executable("ck-client", false));
}
// workaround for desktop releases >= 3.0.7
if (!m_cloakConfig.contains("RemoteHost") && m_cloakConfig.contains(config_key::remote)) {
m_cloakConfig["RemoteHost"] = m_cloakConfig.value(config_key::remote);
m_cloakConfig["RemotePort"] = m_cloakConfig.value(config_key::port);
}
#ifdef QT_DEBUG
m_cloakCfgFile.setAutoRemove(false);
#endif
@ -43,15 +46,8 @@ ErrorCode OpenVpnOverCloakProtocol::start()
m_cloakCfgFile.close();
QStringList args = QStringList() << "-c" << m_cloakCfgFile.fileName()
<< "-s" << m_cloakConfig.value(config_key::remote).toString()
<< "-p" << m_cloakConfig.value(config_key::port).toString(amnezia::protocols::cloak::defaultPort)
<< "-l" << amnezia::protocols::openvpn::defaultPort;
ProtocolEnumNS::TransportProto tp = ProtocolProps::transportProtoFromString(m_cloakConfig.value(config_key::transport_proto).toString());
if (tp == ProtocolEnumNS::TransportProto::Udp) {
args << "-u";
}
qDebug().noquote() << "OpenVpnOverCloakProtocol::start()"
<< cloakExecPath() << args.join(" ");
@ -86,7 +82,6 @@ ErrorCode OpenVpnOverCloakProtocol::start()
return OpenVpnProtocol::start();
}
else return ErrorCode::CloakExecutableMissing;
#endif
}
void OpenVpnOverCloakProtocol::stop()
@ -100,9 +95,12 @@ void OpenVpnOverCloakProtocol::stop()
Utils::signalCtrl(m_ckProcess.processId(), CTRL_C_EVENT);
#endif
#ifndef Q_OS_IOS
m_ckProcess.terminate();
#endif
if (Utils::processIsRunning(Utils::executable("ck-client", false))) {
QThread::msleep(1000);
Utils::killProcessByName(Utils::executable("ck-client", false));
}
}
QString OpenVpnOverCloakProtocol::cloakExecPath()