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

added settings page for v2ray

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-02-13 18:17:42 +03:00
parent 68830021d6
commit 2b0ba2aff9
9 changed files with 176 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/protocols/v2rayprotocol.cpp
View file

@ -32,7 +32,7 @@ ErrorCode V2RayProtocol::start()
QStringList args = QStringList() << "-c" << m_v2RayConfigFile.fileName();
qDebug().noquote() << "ShadowSocksVpnProtocol::start()"
qDebug().noquote() << "V2RayProtocol::start()"
<< v2RayExecPath() << args.join(" ");
m_v2RayProcess.setProcessChannelMode(QProcess::MergedChannels);
@ -41,14 +41,14 @@ ErrorCode V2RayProtocol::start()
m_v2RayProcess.setArguments(args);
connect(&m_v2RayProcess, &QProcess::readyReadStandardOutput, this, [this](){
qDebug().noquote() << "v2ray:" << m_v2RayProcess.readAllStandardOutput();
qDebug().noquote() << "V2Ray:" << m_v2RayProcess.readAllStandardOutput();
});
connect(&m_v2RayProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, [this](int exitCode, QProcess::ExitStatus exitStatus) {
qDebug().noquote() << "V2RayProtocol finished, exitCode, exiStatus" << exitCode << exitStatus;
setConnectionState(VpnProtocol::Disconnected);
if (exitStatus != QProcess::NormalExit){
emit protocolError(amnezia::ErrorCode::ShadowSocksExecutableCrashed); //todo
emit protocolError(amnezia::ErrorCode::V2RayExecutableCrashed);
stop();
}
if (exitCode != 0 ) {
@ -64,8 +64,7 @@ ErrorCode V2RayProtocol::start()
setConnectionState(VpnConnectionState::Connecting);
return OpenVpnProtocol::start();
}
else return ErrorCode::ShadowSocksExecutableMissing;
} else return ErrorCode::V2RayExecutableMissing;
#else
return ErrorCode::NotImplementedError;
#endif