Fixed a couple of stupid ICE related bugs

psi-im · May 31, 2021 · fc2439b · fc2439b
1 parent e817b5e
commit fc2439b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/xmpp/xmpp-im/jingle-ice.cpp b/src/xmpp/xmpp-im/jingle-ice.cpp
@@ -591,7 +591,8 @@ namespace XMPP { namespace Jingle { namespace ICE {
                                        ExternalService::Ptr turnUdp;
                                        ExternalService::Ptr turnTcp;
                                        for (auto const &s : qAsConst(services)) {
-                                           if (s->type == QLatin1String("stun"))
+                                           if (s->type == QLatin1String("stun")
+                                               && (s->transport.isEmpty() || s->transport == QLatin1String("udp")))
                                                stun = s;
                                            else if (s->type == QLatin1String("turn")) {
                                                if (s->transport == QLatin1String("tcp"))

diff --git a/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp b/src/xmpp/xmpp-im/xmpp_externalservicediscovery.cpp
@@ -176,8 +176,8 @@ void ExternalServiceDiscovery::services(QObject *ctx, ServicesCallback &&callbac
         if (types.isEmpty() || types.size() > 1) {
             currentTask = new JT_ExternalServiceDiscovery(client_->rootTask());
             connect(currentTask, &Task::finished, ctx, [this, types, cb = std::move(callback)]() {
-                currentTask = nullptr; // it will self-delete anyway
                 services_   = currentTask->services();
+                currentTask = nullptr; // it will self-delete anyway
                 cb(cachedServices(types));
             });
             currentTask->getServices();