dan9i10/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-08 14:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Botan updated

Browse Source 
QtSsh updated to https://github.com/sandsmark/QSsh
This commit is contained in:
pokamest
2021-07-27 09:33:49 +03:00
parent 1baf36282e
commit 5bf2c1d6e1
399 changed files with 54517 additions and 67586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/core/servercontroller.cpp
View File

@@ -277,7 +277,7 @@ ErrorCode ServerController::uploadFileToHost(const ServerCredentials &credential
localFile.close();
auto job = sftp->uploadFile(localFile.fileName(), remotePath, QSsh::SftpOverwriteMode::SftpOverwriteExisting);
QObject::connect(sftp.data(), &SftpChannel::finished, &wait, [&](QSsh::SftpJobId j, const QString &error){
QObject::connect(sftp.data(), &SftpChannel::finished, &wait, [&](QSsh::SftpJobId j, const SftpError errorType = SftpError::NoError, const QString &error = QString()){
if (job == j) {
qDebug() << "Sftp finished with status" << error;
wait.quit();
@@ -336,12 +336,12 @@ SshConnectionParameters ServerController::sshParams(const ServerCredentials &cre
}
else {
sshParams.authenticationType = QSsh::SshConnectionParameters::AuthenticationTypePassword;
sshParams.password = credentials.password;
sshParams.setPassword(credentials.password);
}
sshParams.host = credentials.hostName;
sshParams.userName = credentials.userName;
sshParams.setHost(credentials.hostName);
sshParams.setUserName(credentials.userName);
sshParams.timeout = 10;
sshParams.port = credentials.port;
sshParams.setPort(credentials.port);
sshParams.hostKeyCheckingMode = QSsh::SshHostKeyCheckingMode::SshHostKeyCheckingNone;
sshParams.options = SshIgnoreDefaultProxy;