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

SSH: Don't allow connectToHost() while already connecting/connected.

Browse Source 
Also fix callers potentially violating this policy.

Change-Id: I630f1c544885df93a81e217e792363c0c2314108
Reviewed-on: http://codereview.qt.nokia.com/1186
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Christian Kandeler
2011-07-05 18:01:58 +02:00
parent 7ecf1e75d4
commit ee635dcf9e
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/ssh/sshconnection.cpp
View File

@@ -620,6 +620,8 @@ void SshConnectionPrivate::sendKeepAlivePacket()
void SshConnectionPrivate::connectToHost()
{
QTC_ASSERT(m_state == SocketUnconnected, return);
m_incomingData.clear();
m_incomingPacket.reset();
m_sendFacility.reset();

3
src/libs/utils/ssh/sshremoteprocessrunner.cpp
View File

@@ -145,7 +145,8 @@ void SshRemoteProcessRunnerPrivate::run(const QByteArray &command)
} else {
connect(m_connection.data(), SIGNAL(connected()),
SLOT(handleConnected()));
m_connection->connectToHost();
if (m_connection->state() == SshConnection::Unconnected)
m_connection->connectToHost();
}
}

3
src/plugins/debugger/gdb/remotegdbprocess.cpp
View File

@@ -98,7 +98,8 @@ void RemoteGdbProcess::realStart(const QString &cmd, const QStringList &args,
handleConnected();
} else {
connect(m_conn.data(), SIGNAL(connected()), this, SLOT(handleConnected()));
m_conn->connectToHost();
if (m_conn->state() == SshConnection::Unconnected)
m_conn->connectToHost();
}
}

3
src/plugins/remotelinux/abstractmaemodeploystep.cpp
View File

@@ -298,7 +298,8 @@ void AbstractMaemoDeployStep::connectToDevice()
connect(m_connection.data(), SIGNAL(connected()), this,
SLOT(handleConnected()));
writeOutput(tr("Connecting to device..."));
m_connection->connectToHost();
if (m_connection->state() == SshConnection::Unconnected)
m_connection->connectToHost();
}
}

3
src/plugins/remotelinux/remotelinuxapplicationrunner.cpp
View File

@@ -105,7 +105,8 @@ void RemoteLinuxApplicationRunner::start()
handleConnected();
} else {
emit reportProgress(tr("Connecting to device..."));
m_connection->connectToHost();
if (m_connection->state() == Utils::SshConnection::Unconnected)
m_connection->connectToHost();
}
}

3
src/plugins/valgrind/valgrind/valgrindprocess.cpp
View File

@@ -186,7 +186,8 @@ void RemoteValgrindProcess::run(const QString &valgrindExecutable, const QString
this, SLOT(connected()));
connect(m_connection.data(), SIGNAL(error(Utils::SshError)),
this, SLOT(error(Utils::SshError)));
m_connection->connectToHost();
if (m_connection->state() == Utils::SshConnection::Unconnected)
m_connection->connectToHost();
} else {
connected();
}