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

SSH: Fix TCP/IP forwarding support.

Browse Source 
We hardcoded the remote host to the SSH server for some reason, and the
originating port was bogus as well.

Change-Id: I8f6700bc12f4374302dd3bfc035c9c9f060f56ef
Reviewed-by: Caspar Romot <cro@icd.ee>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2015-04-14 15:47:55 +02:00
parent aee5668b62
commit bde83c30bf
10 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,10 +184,11 @@ QSharedPointer<SftpChannel> SshConnection::createSftpChannel()
return d->createSftpChannel();
}
SshDirectTcpIpTunnel::Ptr SshConnection::createTunnel(quint16 remotePort)
SshDirectTcpIpTunnel::Ptr SshConnection::createTunnel(const QString &originatingHost,
quint16 originatingPort, const QString &remoteHost, quint16 remotePort)
{
QSSH_ASSERT_AND_RETURN_VALUE(state() == Connected, SshDirectTcpIpTunnel::Ptr());
return d->createTunnel(remotePort);
return d->createTunnel(originatingHost, originatingPort, remoteHost, remotePort);
}
int SshConnection::closeAllChannels()
@@ -828,9 +829,10 @@ QSharedPointer<SftpChannel> SshConnectionPrivate::createSftpChannel()
return m_channelManager->createSftpChannel();
}
SshDirectTcpIpTunnel::Ptr SshConnectionPrivate::createTunnel(quint16 remotePort)
SshDirectTcpIpTunnel::Ptr SshConnectionPrivate::createTunnel(const QString &originatingHost,
quint16 originatingPort, const QString &remoteHost, quint16 remotePort)
{
return m_channelManager->createTunnel(remotePort, m_conn->connectionInfo());
return m_channelManager->createTunnel(originatingHost, originatingPort, remoteHost, remotePort);
}
const quint64 SshConnectionPrivate::InvalidSeqNr = static_cast<quint64>(-1);