ios fixes
This commit is contained in:
parent
12b079df65
commit
9ae2e3fba2
28 changed files with 149639 additions and 39 deletions
|
|
@ -20,11 +20,14 @@ ShadowSocksVpnProtocol::~ShadowSocksVpnProtocol()
|
|||
qDebug() << "ShadowSocksVpnProtocol::~ShadowSocksVpnProtocol";
|
||||
ShadowSocksVpnProtocol::stop();
|
||||
QThread::msleep(200);
|
||||
#ifndef Q_OS_IOS
|
||||
m_ssProcess.close();
|
||||
#endif
|
||||
}
|
||||
|
||||
ErrorCode ShadowSocksVpnProtocol::start()
|
||||
{
|
||||
#ifndef Q_OS_IOS
|
||||
if (Utils::processIsRunning(Utils::executable("ss-local", false))) {
|
||||
Utils::killProcessByName(Utils::executable("ss-local", false));
|
||||
}
|
||||
|
|
@ -77,6 +80,9 @@ ErrorCode ShadowSocksVpnProtocol::start()
|
|||
return OpenVpnProtocol::start();
|
||||
}
|
||||
else return ErrorCode::ShadowSocksExecutableMissing;
|
||||
#else
|
||||
return ErrorCode::NotImplementedError;
|
||||
#endif
|
||||
}
|
||||
|
||||
void ShadowSocksVpnProtocol::stop()
|
||||
|
|
@ -84,7 +90,9 @@ void ShadowSocksVpnProtocol::stop()
|
|||
OpenVpnProtocol::stop();
|
||||
|
||||
qDebug() << "ShadowSocksVpnProtocol::stop()";
|
||||
#ifndef Q_OS_IOS
|
||||
m_ssProcess.terminate();
|
||||
#endif
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
Utils::signalCtrl(m_ssProcess.processId(), CTRL_C_EVENT);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue