From 553ec623c791e668b4790c6874de970fde40bc29 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Tue, 7 Dec 2010 07:57:57 +0000
Subject: improve ICE fallback pair selection

---
 src/QXmppStun.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/QXmppStun.cpp')

diff --git a/src/QXmppStun.cpp b/src/QXmppStun.cpp
index 5bebb379..9565a233 100644
--- a/src/QXmppStun.cpp
+++ b/src/QXmppStun.cpp
@@ -938,6 +938,9 @@ bool QXmppIceComponent::addRemoteCandidate(const QXmppJingleCandidate &candidate
         }
         pair->socket = socket;
         m_pairs << pair;
+
+        if (!m_fallbackPair)
+            m_fallbackPair = pair;
     }
     return true;
 }
@@ -1038,13 +1041,11 @@ void QXmppIceComponent::readyRead()
     if (!messageType || messageCookie != STUN_MAGIC)
     {
         // use this as an opportunity to flag a potential pair
-        if (!m_fallbackPair) {
-            foreach (Pair *pair, m_pairs) {
-                if (pair->remote.host() == remoteHost &&
-                    pair->remote.port() == remotePort) {
-                    m_fallbackPair = pair;
-                    break;
-                }
+        foreach (Pair *pair, m_pairs) {
+            if (pair->remote.host() == remoteHost &&
+                pair->remote.port() == remotePort) {
+                m_fallbackPair = pair;
+                break;
             }
         }
         emit datagramReceived(buffer);
-- 
cgit v1.2.3