andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-21 02:01:03 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

Browse Source
This commit is contained in:
vladimir.kuznetsov
2023-08-16 13:26:41 +05:00
parent e157160337 c7d2a3ffd4
commit e0d6e0117e
12 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/core/servercontroller.cpp
+14 -11
View File
@@ -236,14 +236,7 @@ ErrorCode ServerController::setupContainer(const ServerCredentials &credentials,
ErrorCode e = ErrorCode::NoError;
e = isUserInSudo(credentials, container);
if (e)
return e;
if (!isUpdate) {
e = isServerPortBusy(credentials, container, config);
if (e)
return e;
}
if (e) return e;
e = isServerDpkgBusy(credentials, container);
if (e)
@@ -254,6 +247,16 @@ ErrorCode ServerController::setupContainer(const ServerCredentials &credentials,
return e;
qDebug().noquote() << "ServerController::setupContainer installDockerWorker finished";
if (!isUpdate) {
e = isServerPortBusy(credentials, container, config);
if (e) return e;
}
if (!isUpdate) {
e = isServerPortBusy(credentials, container, config);
if (e) return e;
}
e = prepareHostWorker(credentials, container, config);
if (e)
return e;
@@ -356,8 +359,8 @@ ErrorCode ServerController::installDockerWorker(const ServerCredentials &credent
replaceVars(amnezia::scriptData(SharedScriptType::install_docker), genVarsForScript(credentials)),
cbReadStdOut, cbReadStdErr);
if (stdOut.contains("command not found"))
return ErrorCode::ServerDockerFailedError;
qDebug().noquote() << "ServerController::installDockerWorker" << stdOut;
if (stdOut.contains("command not found")) return ErrorCode::ServerDockerFailedError;
return error;
}
@@ -655,7 +658,7 @@ ErrorCode ServerController::isServerPortBusy(const ServerCredentials &credential
ProtocolProps::transportProtoToString(ProtocolProps::defaultTransportProto(protocol), protocol);
QString transportProto = containerConfig.value(config_key::transport_proto).toString(defaultTransportProto);
QString script = QString("sudo lsof -i -P -n | grep -E ':%1 ").arg(port);
QString script = QString("which lsof &>/dev/null || true && sudo lsof -i -P -n | grep -E ':%1 ").arg(port);
for (auto &port : fixedPorts) {
script = script.append("|:%1").arg(port);
}