aboutsummaryrefslogtreecommitdiff
path: root/src/QXmppStun.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2011-04-23 15:49:58 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2011-04-23 15:49:58 +0000
commitb03f7b486a4b7a3a9ed83712fb7e7ced9f988c47 (patch)
tree11946d04cd6d3805a813e8769201dda388139528 /src/QXmppStun.cpp
parentd461620dcdd69a3b0fc7323db123a7296f57027e (diff)
downloadqxmpp-b03f7b486a4b7a3a9ed83712fb7e7ced9f988c47.tar.gz
* when closing an ICE connection, disable active pair
* when already ICE is already connecting/connected, make connectToHost() a no-op
Diffstat (limited to 'src/QXmppStun.cpp')
-rw-r--r--src/QXmppStun.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/QXmppStun.cpp b/src/QXmppStun.cpp
index 95a04ba8..45d55220 100644
--- a/src/QXmppStun.cpp
+++ b/src/QXmppStun.cpp
@@ -1694,6 +1694,7 @@ void QXmppIceComponent::close()
m_turnAllocation->disconnectFromHost();
m_timer->stop();
m_stunTimer->stop();
+ m_activePair = 0;
}
/// Starts ICE connectivity checks.
@@ -2408,6 +2409,9 @@ void QXmppIceConnection::close()
void QXmppIceConnection::connectToHost()
{
+ if (isConnected() || m_connectTimer->isActive())
+ return;
+
foreach (QXmppIceComponent *socket, m_components.values())
socket->connectToHost();
m_connectTimer->start();