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

Get rid of SshConnectionInfo

Browse Source 
It's not used anymore.

Change-Id: Ie77c9d9bc8eb82c1f74cfdac2304bc6c2f92ee93
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-05-02 23:21:42 +02:00
parent de4f71b2cf
commit 8e931838ef
4 changed files with 0 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,7 +166,6 @@ struct SshConnection::SshConnectionPrivate
}
const SshConnectionParameters connParams;
SshConnectionInfo connInfo;
QtcProcess masterProcess;
QString errorString;
std::unique_ptr<QTemporaryDir> masterSocketDir;
@@ -250,38 +249,6 @@ SshConnectionParameters SshConnection::connectionParameters() const
return d->connParams;
}
SshConnectionInfo SshConnection::connectionInfo() const
{
QTC_ASSERT(state() == Connected, return SshConnectionInfo());
if (d->connInfo.isValid())
return d->connInfo;
QtcProcess p;
const FilePath sshFilePath = SshSettings::sshFilePath();
p.setCommand({sshFilePath, d->connectionArgs(sshFilePath) << "echo" << "-n" << "$SSH_CLIENT"});
p.start();
if (!p.waitForStarted() || !p.waitForFinished()) {
qCWarning(Internal::sshLog) << "failed to retrieve connection info:" << p.errorString();
return SshConnectionInfo();
}
const QByteArrayList data = p.readAllStandardOutput().split(' ');
if (data.size() != 3) {
qCWarning(Internal::sshLog) << "failed to retrieve connection info: unexpected output";
return SshConnectionInfo();
}
d->connInfo.localPort = data.at(1).toInt();
if (d->connInfo.localPort == 0) {
qCWarning(Internal::sshLog) << "failed to retrieve connection info: unexpected output";
return SshConnectionInfo();
}
if (!d->connInfo.localAddress.setAddress(QString::fromLatin1(data.first()))) {
qCWarning(Internal::sshLog) << "failed to retrieve connection info: unexpected output";
return SshConnectionInfo();
}
d->connInfo.peerPort = d->connParams.port();
d->connInfo.peerAddress.setAddress(d->connParams.host());
return d->connInfo;
}
QStringList SshConnection::connectionOptions(const FilePath &binary) const
{
return d->connectionOptions(binary);