feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SSH: Ignore connection timeout with Microsoft's OpenSSH

Browse Source 
The Microsoft-provided ssh binaries misinterpret the connection timeout
in that they only start to connect after that period has passed, which
slows down the connection process. So let's not use the timeout option
there.

Change-Id: I5a5335c7f1b4af04f1afb5603ab0f1a518e8c95e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Christian Kandeler
2019-10-01 11:07:06 +02:00
parent b895dfa382
commit 030fd96d18
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/libs/ssh/sshconnection.cpp
View File

@@ -110,7 +110,7 @@ struct SshConnection::SshConnectionPrivate
return masterSocketDir->path() + "/cs";
}
QStringList connectionOptions() const
QStringList connectionOptions(const FilePath &binary) const
{
QString hostKeyCheckingString;
switch (connParams.hostKeyCheckingMode) {
@@ -134,14 +134,19 @@ struct SshConnection::SshConnectionPrivate
args << "-o" << "BatchMode=yes";
if (sharingEnabled)
args << "-o" << ("ControlPath=" + socketFilePath());
if (connParams.timeout != 0)
bool useTimeout = connParams.timeout != 0;
if (useTimeout && HostOsInfo::isWindowsHost()
&& binary.toString().toLower().contains("/system32/")) {
useTimeout = false;
}
if (useTimeout)
args << "-o" << ("ConnectTimeout=" + QString::number(connParams.timeout));
return args;
}
QStringList connectionArgs() const
QStringList connectionArgs(const FilePath &binary) const
{
return connectionOptions() << connParams.host();
return connectionOptions(binary) << connParams.host();
}
SshConnectionParameters connParams;
@@ -267,8 +272,8 @@ SshConnectionInfo SshConnection::connectionInfo() const
if (d->connInfo.isValid())
return d->connInfo;
QProcess p;
p.start(SshSettings::sshFilePath().toString(), d->connectionArgs() << "echo" << "-n"
<< "$SSH_CLIENT");
p.start(SshSettings::sshFilePath().toString(), d->connectionArgs(SshSettings::sshFilePath())
<< "echo" << "-n" << "$SSH_CLIENT");
if (!p.waitForStarted() || !p.waitForFinished()) {
qCWarning(Internal::sshLog) << "failed to retrieve connection info:" << p.errorString();
return SshConnectionInfo();
@@ -292,9 +297,9 @@ SshConnectionInfo SshConnection::connectionInfo() const
return d->connInfo;
}
QStringList SshConnection::connectionOptions() const
QStringList SshConnection::connectionOptions(const FilePath &binary) const
{
return d->connectionOptions();
return d->connectionOptions(binary);
}
bool SshConnection::sharingEnabled() const
@@ -312,7 +317,8 @@ SshConnection::~SshConnection()
SshRemoteProcessPtr SshConnection::createRemoteProcess(const QString &command)
{
QTC_ASSERT(state() == Connected, return SshRemoteProcessPtr());
return SshRemoteProcessPtr(new SshRemoteProcess(command, d->connectionArgs()));
return SshRemoteProcessPtr(new SshRemoteProcess(command,
d->connectionArgs(SshSettings::sshFilePath())));
}
SshRemoteProcessPtr SshConnection::createRemoteShell()
@@ -335,7 +341,7 @@ SftpTransferPtr SshConnection::createDownload(const FilesToTransfer &files,
SftpSessionPtr SshConnection::createSftpSession()
{
QTC_ASSERT(state() == Connected, return SftpSessionPtr());
return SftpSessionPtr(new SftpSession(d->connectionArgs()));
return SftpSessionPtr(new SftpSession(d->connectionArgs(SshSettings::sftpFilePath())));
}
void SshConnection::doConnectToHost()
@@ -359,7 +365,8 @@ void SshConnection::doConnectToHost()
.arg(d->masterSocketDir->errorString()));
return;
}
QStringList args = QStringList{"-M", "-N", "-o", "ControlPersist=no"} << d->connectionArgs();
QStringList args = QStringList{"-M", "-N", "-o", "ControlPersist=no"}
<< d->connectionArgs(sshBinary);
if (!d->connParams.x11DisplayName.isEmpty())
args.prepend("-X");
qCDebug(sshLog) << "establishing connection:" << sshBinary.toUserOutput() << args;
@@ -393,7 +400,8 @@ SftpTransferPtr SshConnection::setupTransfer(
FileTransferErrorHandling errorHandlingMode)
{
QTC_ASSERT(state() == Connected, return SftpTransferPtr());
return SftpTransferPtr(new SftpTransfer(files, type, errorHandlingMode, d->connectionArgs()));
return SftpTransferPtr(new SftpTransfer(files, type, errorHandlingMode,
d->connectionArgs(SshSettings::sftpFilePath())));
}
} // namespace QSsh